Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run CI E2E against latest its ( 6.0.3) #85

Merged
merged 2 commits into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGES
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion MAINTAINER
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion MAINTAINERS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright 2020-2023 Zeek-Kafka
Copyright 2020-2024 Zeek-Kafka

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2020-2023 Zeek-Kafka
Copyright 2020-2024 Zeek-Kafka

The Initial Developer of this project, which was copied from, derived from,
or inspired by Apache Metron, is The Apache Software Foundation
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright 2020-2023 Zeek-Kafka
Copyright 2020-2024 Zeek-Kafka
Copyright 2015-2020 The Apache Software Foundation

Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion ci/lint.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion cmake/FindLibRDKafka.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion cmake/FindOpenSSL.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion configure.plugin
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docker/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright 2020-2023 Zeek-Kafka
Copyright 2020-2024 Zeek-Kafka
Copyright 2015-2020 The Apache Software Foundation

Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docker/containers/zeek/Dockerfile.ubuntu:20.04
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docker/containers/zeek/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ services:
- zeek-kafka_zeek:latest
- ${ZEEK_KAFKA_OS}
args:
ZEEK_VERSION: "4.2.2"
ZEEK_VERSION: "6.0.3"
LIBRDKAFKA_VERSION: "1.4.4"
image: zeek-kafka_zeek:latest
depends_on:
Expand Down
2 changes: 1 addition & 1 deletion docker/finish_end_to_end.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docker/in_docker_scripts/build_plugin.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docker/in_docker_scripts/configure_plugin.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docker/in_docker_scripts/process_data_file.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# shellcheck disable=SC2010
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docker/run_end_to_end.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docker/scripts/analyze_results.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docker/scripts/docker_execute_build_plugin.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docker/scripts/docker_execute_configure_plugin.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docker/scripts/docker_execute_create_topic_in_kafka.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docker/scripts/docker_execute_process_data_file.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docker/scripts/docker_execute_shell.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docker/scripts/docker_run_consume_kafka.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docker/scripts/docker_run_get_offset_kafka.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docker/scripts/download_sample_pcaps.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docker/scripts/print_results.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion docker/scripts/split_kafka_output_by_log.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# shellcheck disable=SC2143,SC1083,SC2002,SC2126
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion scripts/Seiso/Kafka/__load__.zeek
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion scripts/Seiso/Kafka/logs-to-kafka.zeek
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion scripts/__load__.zeek
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion scripts/init.zeek
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion src/KafkaWriter.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020-2023 Zeek-Kafka
* Copyright 2020-2024 Zeek-Kafka
* Copyright 2015-2020 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion src/KafkaWriter.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020-2023 Zeek-Kafka
* Copyright 2020-2024 Zeek-Kafka
* Copyright 2015-2020 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion src/Plugin.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020-2023 Zeek-Kafka
* Copyright 2020-2024 Zeek-Kafka
* Copyright 2015-2020 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion src/Plugin.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020-2023 Zeek-Kafka
* Copyright 2020-2024 Zeek-Kafka
* Copyright 2015-2020 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion src/TaggedJSON.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020-2023 Zeek-Kafka
* Copyright 2020-2024 Zeek-Kafka
* Copyright 2015-2020 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion src/TaggedJSON.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2020-2023 Zeek-Kafka
* Copyright 2020-2024 Zeek-Kafka
* Copyright 2015-2020 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion src/events.bif
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion src/kafka.bif
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion src/kafka_const.bif
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"""

#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion tests/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion tests/Scripts/diff-remove-timestamps
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion tests/Scripts/get-zeek-env
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion tests/btest.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion tests/kafka/l2s-l2e-no-overlap.zeek
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion tests/kafka/l2s-set-l2e-set.zeek
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2020-2023 Zeek-Kafka
# Copyright 2020-2024 Zeek-Kafka
# Copyright 2015-2020 The Apache Software Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Loading
Loading