Update Zeek to 4.0.5, drop CentOS 8 support (#38)

SeisoLLC · Apr 21, 2022 · 9c160d8 · 9c160d8
1 parent a200311
commit 9c160d8
Show file tree

Hide file tree

Showing 70 changed files with 86 additions and 177 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         platform: [Ubuntu-20.04]
-        zeek-kafka-os: [centos, ubuntu]
+        zeek-kafka-os: [ubuntu]
       fail-fast: false
     runs-on: ${{ matrix.platform }}
     steps:

diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2021 Zeek-Kafka
+#  Copyright 2020-2022 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2021 Zeek-Kafka
+#  Copyright 2020-2022 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/MAINTAINER b/MAINTAINER
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2021 Zeek-Kafka
+#  Copyright 2020-2022 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/MAINTAINERS.md b/MAINTAINERS.md
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2020-2021 Zeek-Kafka
+  Copyright 2020-2022 Zeek-Kafka
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2021 Zeek-Kafka
+#  Copyright 2020-2022 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,7 +20,7 @@
 SHELL           := bash
 CMAKE_BUILD_DIR  = build
 ARCH             = `uname -s | tr A-Z a-z`-`uname -m`
-ZEEK_KAFKA_OS   ?= centos
+ZEEK_KAFKA_OS   ?= ubuntu
 
 .PHONY: all
 all: build-it

diff --git a/NOTICE b/NOTICE
@@ -1,4 +1,4 @@
-   Copyright 2020-2021 Zeek-Kafka
+   Copyright 2020-2022 Zeek-Kafka
 
    The Initial Developer of this project, which was copied from, derived from,
    or inspired by Apache Metron, is The Apache Software Foundation

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2020-2021 Zeek-Kafka
+  Copyright 2020-2022 Zeek-Kafka
   Copyright 2015-2020 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,13 +28,13 @@ A Zeek log writer that sends logging output to Kafka, providing a convenient mea
 
 `zkg` is the preferred mechanism for installing this plugin, as it will dynamically retrieve, build, test, and load the plugin. Note, that you will still need to [activate](#activation) and configure the plugin after your installation.
 
-1. Install [librdkafka](https://github.com/edenhill/librdkafka), a native client library for Kafka. This plugin has been tested against librdkafka v1.4.2.
+1. Install [librdkafka](https://github.com/edenhill/librdkafka), a native client library for Kafka. This plugin has been tested against librdkafka v1.4.4.
 
     In order to use this plugin within a kerberized Kafka environment, you will also need `libsasl2` installed and will need to pass `--enable-sasl` to the `configure` script.
 
     ```
-    $ curl -L https://github.com/edenhill/librdkafka/archive/v1.4.2.tar.gz | tar xvz
-    $ cd librdkafka-1.4.2/
+    $ curl -L https://github.com/edenhill/librdkafka/archive/v1.4.4.tar.gz | tar xvz
+    $ cd librdkafka-1.4.4/
     $ ./configure --enable-sasl
     $ make
     $ sudo make install
@@ -79,12 +79,12 @@ Manually installing the plugin should *only* occur in situations where installin
 
 These instructions could also be helpful if you were interested in distributing this as a package (such as a deb or rpm).
 
-1. Install [librdkafka](https://github.com/edenhill/librdkafka), a native client library for Kafka. This plugin has been tested against librdkafka v1.4.2.
+1. Install [librdkafka](https://github.com/edenhill/librdkafka), a native client library for Kafka. This plugin has been tested against librdkafka v1.4.4.
 
     In order to use this plugin within a kerberized Kafka environment, you will also need `libsasl2` installed and will need to pass `--enable-sasl` to the `configure` script.
 
     ```
-    $ curl -L https://github.com/edenhill/librdkafka/archive/v1.4.2.tar.gz | tar xvz
+    $ curl -L https://github.com/edenhill/librdkafka/archive/v1.4.4.tar.gz | tar xvz
     $ cd librdkafka-1.4.2/
     $ ./configure --enable-sasl
     $ make
@@ -335,7 +335,7 @@ redef Kafka::topic_name = "zeek";
 The global configuration settings for Kafka. These values are passed through
 directly to librdkafka. Any valid librdkafka settings can be defined in this
 table. The full set of valid librdkafka settings are available
-[here](https://github.com/edenhill/librdkafka/blob/v1.4.2/CONFIGURATION.md).
+[here](https://github.com/edenhill/librdkafka/blob/v1.4.4/CONFIGURATION.md).
 
 ```
 redef Kafka::kafka_conf = table(

diff --git a/VERSION b/VERSION
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2021 Zeek-Kafka
+#  Copyright 2020-2022 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/ci/lint.sh b/ci/lint.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-#  Copyright 2020-2021 Zeek-Kafka
+#  Copyright 2020-2022 Zeek-Kafka
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.

diff --git a/cmake/FindLibRDKafka.cmake b/cmake/FindLibRDKafka.cmake
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2021 Zeek-Kafka
+#  Copyright 2020-2022 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/cmake/FindOpenSSL.cmake b/cmake/FindOpenSSL.cmake
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2021 Zeek-Kafka
+#  Copyright 2020-2022 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/configure b/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#  Copyright 2020-2021 Zeek-Kafka
+#  Copyright 2020-2022 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/configure.plugin b/configure.plugin
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#  Copyright 2020-2021 Zeek-Kafka
+#  Copyright 2020-2022 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/docker/README.md b/docker/README.md
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2020-2021 Zeek-Kafka
+  Copyright 2020-2022 Zeek-Kafka
   Copyright 2015-2020 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -223,15 +223,15 @@ Other scripts may then be used to do your testing, for example running:
 --plugin-version                [OPTIONAL] The plugin version. Default: the current branch name
 --skip-docker-build             [OPTIONAL] Skip build of zeek docker machine.
 --test-output                   [OPTIONAL] The test output path. Default: ./test_output/DATETIME
---zeek-kafka-os                 [OPTIONAL] The OS to run zeek and zeek-kafka in. Default: centos
+--zeek-kafka-os                 [OPTIONAL] The OS to run zeek and zeek-kafka in. Default: ubuntu
 ```
 
 > NOTE: The provided `--plugin-version` is passed to the [`zkg install`](https://docs.zeek.org/projects/package-manager/en/stable/zeek-pkg.html#install-command) command within the container, which allows you to specify a version tag, branch name, or commit hash.  However, that tag, branch, or commit *must* be available in the currently checked out plugin repository.
 
 ##### `finish_end_to_end.sh`
 ###### Parameters
 ```bash
---zeek-kafka-os     [OPTIONAL] The OS to run zeek and zeek-kafka in. Default: centos
+--zeek-kafka-os     [OPTIONAL] The OS to run zeek and zeek-kafka in. Default: ubuntu
 ```
 
 > NOTE: Currently, the OS definition for `finish_end_to_end.sh` does not need to be specified to work, regardless of which `zeek-kafka` OS was created with `run_end_to_end.sh`.
diff --git a/docker/containers/kafka/Dockerfile b/docker/containers/kafka/Dockerfile
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2021 Zeek-Package
+#  Copyright 2020-2022 Zeek-Package
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/docker/containers/zeek/Dockerfile.centos:8 b/docker/containers/zeek/Dockerfile.centos:8
diff --git a/docker/containers/zeek/Dockerfile.ubuntu:20.04 b/docker/containers/zeek/Dockerfile.ubuntu:20.04
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2021 Zeek-Kafka
+#  Copyright 2020-2022 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/docker/containers/zeek/Makefile b/docker/containers/zeek/Makefile
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2021 Zeek-Kafka
+#  Copyright 2020-2022 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/docker/containers/zookeeper/Dockerfile b/docker/containers/zookeeper/Dockerfile
@@ -1,5 +1,5 @@
 #
-#  Copyright 2020-2021 Zeek-Package
+#  Copyright 2020-2022 Zeek-Package
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -45,8 +45,8 @@ services:
         - zeek-kafka_zeek:latest
         - ${ZEEK_KAFKA_OS}
       args:
-        ZEEK_VERSION: "4.0.1"
-        LIBRDKAFKA_VERSION: "1.4.2"
+        ZEEK_VERSION: "4.0.5"
+        LIBRDKAFKA_VERSION: "1.4.4"
     image: zeek-kafka_zeek:latest
     depends_on:
       zookeeper:

diff --git a/docker/finish_end_to_end.sh b/docker/finish_end_to_end.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 #
-#  Copyright 2020-2021 Zeek-Kafka
-#  Copyright 2020-2021 The Apache Software Foundation
+#  Copyright 2020-2022 Zeek-Kafka
+#  Copyright 2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -30,12 +30,12 @@ set -o pipefail
 function help {
   echo " "
   echo "USAGE"
-  echo "    --zeek-kafka-os     [OPTIONAL] The OS to run zeek and zeek-kafka in. Default: centos"
+  echo "    --zeek-kafka-os     [OPTIONAL] The OS to run zeek and zeek-kafka in. Default: ubuntu"
   echo "    -h/--help           Usage information."
 }
 
 PROJECT_NAME="zeek-kafka"
-ZEEK_KAFKA_OS="centos"
+ZEEK_KAFKA_OS="ubuntu"
 
 # Handle command line options
 for i in "$@"; do
@@ -62,10 +62,8 @@ done
 
 if [[ "${ZEEK_KAFKA_OS}" == "ubuntu" ]]; then
   ZEEK_KAFKA_OS="ubuntu:20.04"
-elif [[ "${ZEEK_KAFKA_OS}" == "centos" ]]; then
-  ZEEK_KAFKA_OS="centos:8"
 else
-  echo "OS must be ubuntu or centos"
+  echo "OS must be ubuntu"
   exit 1
 fi
 

diff --git a/docker/in_docker_scripts/build_plugin.sh b/docker/in_docker_scripts/build_plugin.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-#  Copyright 2020-2021 Zeek-Kafka
+#  Copyright 2020-2022 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/docker/in_docker_scripts/configure_plugin.sh b/docker/in_docker_scripts/configure_plugin.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-#  Copyright 2020-2021 Zeek-Kafka
+#  Copyright 2020-2022 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/docker/in_docker_scripts/process_data_file.sh b/docker/in_docker_scripts/process_data_file.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2010
 #
-#  Copyright 2020-2021 Zeek-Kafka
+#  Copyright 2020-2022 Zeek-Kafka
 #  Copyright 2015-2020 The Apache Software Foundation
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");