From e7a1bde77da96d8a15ab522f70f988beef81851e Mon Sep 17 00:00:00 2001 From: Felix Ortmann Date: Tue, 15 Dec 2020 15:04:35 +0100 Subject: [PATCH 1/2] Bump all version for December release --- apps/vast/setup.py | 4 ++-- plugins/apps/threatbus_cif3/setup.py | 4 ++-- plugins/apps/threatbus_misp/setup.py | 4 ++-- plugins/apps/threatbus_zeek/setup.py | 4 ++-- plugins/apps/threatbus_zmq_app/setup.py | 4 ++-- plugins/backbones/file_benchmark/setup.py | 4 ++-- plugins/backbones/threatbus_inmem/setup.py | 4 ++-- plugins/backbones/threatbus_rabbitmq/setup.py | 4 ++-- setup.py | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/apps/vast/setup.py b/apps/vast/setup.py index 2f47d566..409296b1 100644 --- a/apps/vast/setup.py +++ b/apps/vast/setup.py @@ -32,7 +32,7 @@ "confuse", "pyzmq>=19", "pyvast>=2020.10.29", - "threatbus>=2020.11.26", + "threatbus>=2020.12.16", "unflatten", ], keywords=[ @@ -52,5 +52,5 @@ python_requires=">=3.7", setup_requires=["setuptools", "wheel"], url="https://github.com/tenzir/threatbus", - version="2020.11.26", + version="2020.12.16", ) diff --git a/plugins/apps/threatbus_cif3/setup.py b/plugins/apps/threatbus_cif3/setup.py index ad86e371..74d2ea77 100644 --- a/plugins/apps/threatbus_cif3/setup.py +++ b/plugins/apps/threatbus_cif3/setup.py @@ -25,7 +25,7 @@ ], description="A plugin to enable indicators to be submitted to CIFv3 in real-time", entry_points={"threatbus.app": ["cif3 = threatbus_cif3.plugin"]}, - install_requires=["threatbus>=2020.11.26", "cifsdk>3.0.0rc4,<4.0"], + install_requires=["threatbus>=2020.12.16", "cifsdk>3.0.0rc4,<4.0"], keywords=[ "cif", "cifv3", @@ -46,5 +46,5 @@ packages=["threatbus_cif3"], python_requires=">=3.6", url="https://github.com/tenzir/threatbus", - version="2020.11.26", + version="2020.12.16", ) diff --git a/plugins/apps/threatbus_misp/setup.py b/plugins/apps/threatbus_misp/setup.py index 715a88e7..e5bdcb8b 100644 --- a/plugins/apps/threatbus_misp/setup.py +++ b/plugins/apps/threatbus_misp/setup.py @@ -26,7 +26,7 @@ description="A plugin to enable threatbus communication with MISP.", entry_points={"threatbus.app": ["misp = threatbus_misp.plugin"]}, install_requires=[ - "threatbus>=2020.11.26", + "threatbus>=2020.12.16", "pymisp >= 2.4.120, <= 2.4.134", "pyzmq>=18.1.1", "confluent-kafka>=1.3.0", @@ -47,5 +47,5 @@ packages=["threatbus_misp"], python_requires=">=3.7", url="https://github.com/tenzir/threatbus", - version="2020.11.26", + version="2020.12.16", ) diff --git a/plugins/apps/threatbus_zeek/setup.py b/plugins/apps/threatbus_zeek/setup.py index 226347ea..4a4617b2 100644 --- a/plugins/apps/threatbus_zeek/setup.py +++ b/plugins/apps/threatbus_zeek/setup.py @@ -26,7 +26,7 @@ description="A plugin to enable threatbus communication with Zeek network monitor.", entry_points={"threatbus.app": ["zeek = threatbus_zeek.plugin"]}, install_requires=[ - "threatbus>=2020.11.26", + "threatbus>=2020.12.16", ], keywords=["threatbus", "Zeek", "intrusion detection", "IDS", "broker", "plugin"], license="BSD 3-clause", @@ -37,5 +37,5 @@ python_requires=">=3.7", setup_requires=["setuptools", "wheel"], url="https://github.com/tenzir/threatbus", - version="2020.11.26", + version="2020.12.16", ) diff --git a/plugins/apps/threatbus_zmq_app/setup.py b/plugins/apps/threatbus_zmq_app/setup.py index 5b5603fd..901fd8c2 100644 --- a/plugins/apps/threatbus_zmq_app/setup.py +++ b/plugins/apps/threatbus_zmq_app/setup.py @@ -26,7 +26,7 @@ description="A plugin to connect apps via ZeroMQ.", entry_points={"threatbus.app": ["zmq-app = threatbus_zmq_app.plugin"]}, install_requires=[ - "threatbus>=2020.11.26", + "threatbus>=2020.12.16", "pyzmq>=19", "python-dateutil>=2.8.1", ], @@ -44,5 +44,5 @@ packages=["threatbus_zmq_app"], python_requires=">=3.7", url="https://github.com/tenzir/threatbus", - version="2020.11.26", + version="2020.12.16", ) diff --git a/plugins/backbones/file_benchmark/setup.py b/plugins/backbones/file_benchmark/setup.py index c9dda24e..57928ade 100644 --- a/plugins/backbones/file_benchmark/setup.py +++ b/plugins/backbones/file_benchmark/setup.py @@ -22,7 +22,7 @@ ], description="A simplistic in-memory backbone for threatbus.", entry_points={"threatbus.backbone": ["file_benchmark = file_benchmark.plugin"]}, - install_requires=["threatbus>=2020.11.26"], + install_requires=["threatbus>=2020.12.16"], keywords=["threatbus", "plugin"], license="BSD 3-clause", long_description=long_description, @@ -31,5 +31,5 @@ packages=["file_benchmark"], python_requires=">=3.7", url="https://github.com/tenzir/threatbus", - version="2020.11.26", + version="2020.12.16", ) diff --git a/plugins/backbones/threatbus_inmem/setup.py b/plugins/backbones/threatbus_inmem/setup.py index 7b98442d..20d9e042 100644 --- a/plugins/backbones/threatbus_inmem/setup.py +++ b/plugins/backbones/threatbus_inmem/setup.py @@ -22,7 +22,7 @@ ], description="A simplistic in-memory backbone for threatbus.", entry_points={"threatbus.backbone": ["inmem = threatbus_inmem.plugin"]}, - install_requires=["threatbus>=2020.11.26"], + install_requires=["threatbus>=2020.12.16"], keywords=["threatbus", "plugin"], license="BSD 3-clause", long_description=long_description, @@ -31,5 +31,5 @@ packages=["threatbus_inmem"], python_requires=">=3.7", url="https://github.com/tenzir/threatbus", - version="2020.11.26", + version="2020.12.16", ) diff --git a/plugins/backbones/threatbus_rabbitmq/setup.py b/plugins/backbones/threatbus_rabbitmq/setup.py index 83f50a19..37550bca 100644 --- a/plugins/backbones/threatbus_rabbitmq/setup.py +++ b/plugins/backbones/threatbus_rabbitmq/setup.py @@ -22,7 +22,7 @@ ], description="A RabbitMQ backbone for threatbus.", entry_points={"threatbus.backbone": ["rabbitmq = threatbus_rabbitmq.plugin"]}, - install_requires=["threatbus>=2020.11.26", "pika>=1.1.0", "retry"], + install_requires=["threatbus>=2020.12.16", "pika>=1.1.0", "retry"], keywords=["threatbus", "plugin"], license="BSD 3-clause", long_description=long_description, @@ -31,5 +31,5 @@ packages=["threatbus_rabbitmq"], python_requires=">=3.7", url="https://github.com/tenzir/threatbus", - version="2020.11.30", + version="2020.12.16", ) diff --git a/setup.py b/setup.py index ce04d436..5f7d172c 100644 --- a/setup.py +++ b/setup.py @@ -47,5 +47,5 @@ python_requires=">=3.7", setup_requires=["setuptools", "wheel"], url="https://github.com/tenzir/threatbus", - version="2020.11.26", + version="2020.12.16", ) From 4bac6e63b79cf7225201ce8010f7aae3459b793f Mon Sep 17 00:00:00 2001 From: Felix Ortmann Date: Tue, 15 Dec 2020 15:07:28 +0100 Subject: [PATCH 2/2] Rotate changelogs for December release --- CHANGELOG.md | 9 ++++++--- apps/vast/CHANGELOG.md | 7 +++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0a1ddb7..c7f9b045 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,20 +9,22 @@ Every entry has a category for which we use the following visual abbreviations: - ⚠️ change - 🐞 bugfix -## Unreleased + + +## [2020.12.16] - 🎁 New systemd unit files are now available in the Threat Bus [repository](https://github.com/tenzir/threatbus/tree/master/threatbus) to run both Threat Bus and `pyvast-threatbus` as system services. [#77](https://github.com/tenzir/threatbus/pull/77) -## [2020.11.30] +## [2020.11.30] - 🐞 The RabbitMQ backbone plugin ignored user-defined queue parameters, such as `durable` or `lazy` queues. It now respects such parameters again. [#76](https://github.com/tenzir/threatbus/pull/76) -## [2020.11.26] +## [2020.11.26] - 🐞 The Zeek app did not perform an outbound connection to Threat Bus in cluster mode. Now the master peers with Threat Bus to establish a connection. @@ -82,3 +84,4 @@ Every entry has a category for which we use the following visual abbreviations: [2020.10.29]: https://github.com/tenzir/threatbus/releases/tag/2020.10.29 [2020.11.26]: https://github.com/tenzir/threatbus/releases/tag/2020.11.26 [2020.11.30]: https://github.com/tenzir/threatbus/releases/tag/2020.11.30 +[2020.12.16]: https://github.com/tenzir/threatbus/releases/tag/2020.12.16 diff --git a/apps/vast/CHANGELOG.md b/apps/vast/CHANGELOG.md index 1785efba..f3f1a8fc 100644 --- a/apps/vast/CHANGELOG.md +++ b/apps/vast/CHANGELOG.md @@ -10,7 +10,9 @@ Every entry has a category for which we use the following visual abbreviations: - ⚡️ breaking change - 🐞 bugfix - ## Unreleased + + +## [2020.12.16] - 🎁 `pyvast-threatbus` now uses the Threat Bus `logger` module. Users can configure logging the same way as in Threat Bus, via a `logging` section in @@ -18,7 +20,7 @@ Every entry has a category for which we use the following visual abbreviations: option are mutually exclusive. [#80](https://github.com/tenzir/threatbus/pull/80) -## [2020.11.26] +## [2020.11.26] - 🐞 `pyvast-threatbus` escapes backslashes and quotes in IoCs before it queries VAST. @@ -37,3 +39,4 @@ Every entry has a category for which we use the following visual abbreviations: [#63](https://github.com/tenzir/threatbus/pull/63) [2020.11.26]: https://github.com/tenzir/threatbus/releases/tag/2020.11.26 +[2020.12.16]: https://github.com/tenzir/threatbus/releases/tag/2020.12.16