Merge branch 'develop' of github.com:certtools/intelmq into develop

Author: aaronkaplan

CHANGELOG.md

@@ -7,7 +7,7 @@
 
 
 
-3.3.0 
+3.3.0 (2024-03-01)
 ------------------
 
 ### Configuration

NEWS.md

@@ -10,7 +10,7 @@ This file lists all changes which have an affect on the administration of IntelM
 Please refer to the change log for a full list of changes.
 
 
-3.3.0 Feature release 
+3.3.0 Feature release  (2024-03-01)
 ---------------------
 
 ### Documentation

debian/changelog

@@ -2,7 +2,7 @@ intelmq (3.3.0-1) stable; urgency=medium
 
   * 3.3.0 Feature release
 
- -- Sebastian Wagner <[email protected]>  Tue, 05 Sep 2023 15:05:07 +0200
+ -- Aaron Kaplan <[email protected]>  Fr, 01 Mar 2024 14:19:00 +0100
 
 intelmq (3.2.1-2) stable; urgency=medium
 

docs/dev/release.md

@@ -17,7 +17,7 @@ different.
 -   Check the upgrade functions in `intelmq/lib/upgrades.py`.
 -   Close the milestone on GitHub and move any open issues to the next
     one.
--   `docs/user/installation.rst`: Update supported operating systems.
+-   `docs/admin/installation/linux-packages.md`: Update supported operating systems.
 
 ## Documentation
 
@@ -39,22 +39,21 @@ Eventually adapt the default log levels if necessary. Should be INFO for stable
 ### IntelMQ Manager
 
 -   `intelmq_manager/version.py`: Update the version.
--   `intelmq_manager/static/images/js/about.js`: Update the version.
+-   `intelmq_manager/static/js/about.js`: Update the version.
 
 ## Commit, push, review and merge
 
-Commit your changes in a separate branch, the final commit message
-should start with `REL:`. Push and create a pull request to maintenance
-and after that from maintenance to master. Someone else should review
-the changes. Eventually fix them, make sure the `REL:` is the last
-commit, you can also push that one at last, after the reviews.
+Commit your changes in a separate branch, the final commit message should start
+with `REL:`. Push and create a pull request to the `develop` branch. Someone
+else should review the changes. Eventually fix them, make sure the `REL:` is
+the last commit, you can also push that one at last, after the reviews.
 
 Why a separate branch? Because if problems show up, you can still
 force-push to that one, keeping the release commit the latest one.
 
 ## Tag and release
 
-Tag the commit with `git tag -s version HEAD`, merge it into master,
+Tag the commit with `git tag -s version HEAD`, merge it into `develop`,
 push the branches *and* the tag. The tag is just `a.b.c`, not prefixed
 with `v` (that was necessary only with SVN a long time ago...).
 

docs/index.md

@@ -9,6 +9,7 @@
 
 ![IntelMQ](docs/static/images/Logo_Intel_MQ.svg)
 
+
 # Introduction
 
 **IntelMQ** is a solution for IT security teams (CERTs & CSIRTs, SOCs

intelmq/bots/parsers/shadowserver/parser.py

@@ -120,7 +120,7 @@ def parse_line(self, row, report):
         event.add('feed.name', self.feedname, overwrite=self.overwrite)
 
         # set feed.documentation to a report url
-        event.add('feed.documentation', conf.get('url'))
+        event.add('feed.documentation', conf.get('url'), overwrite=False)
 
         extra = {}  # The Json-Object which will be populated with the
         # fields that could not be added to the standard intelmq fields

intelmq/version.py

@@ -2,5 +2,5 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-__version_info__ = (3, 3, 0, '')
+__version_info__ = (3, 3, 0)
 __version__ = '.'.join(map(str, __version_info__))