Skip to content

Commit 2479994

Browse files
author
Birger Schacht
committed
Remove postgresql output bot
... and mention this in the Changelog and the News file. There was already an upgrade function in 2.1.0 deprecating the bot, so none was added for this change.
1 parent 9d4baa8 commit 2479994

File tree

4 files changed

+5
-28
lines changed

4 files changed

+5
-28
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ CHANGELOG
7171
#### Outputs
7272
- `intelmq.bots.outputs.mcafee.output_esm_ip`: Fix access to parameters, the bot wrongly used `self.parameters` (by Sebastian Wagner).
7373
- `intelmq.bots.outputs.misp.output_api`: Fix access to parameters, the bot wrongly used `self.parameters` (by Sebastian Wagner).
74+
- Removed `intelmq.bots.outputs.postgresql`: this bot was marked as deprecated in 2019 announced to be removed in version 3 of IntelMQ (PR#2045 by Birger Schacht).
7475

7576
### Documentation
7677
- Various formatting fixes (by Sebastian Wagner).

NEWS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ Please refer to the changelog for a full list of changes.
3535

3636
### Bots
3737
The malwardomains parser bot was removed. The malwaredomains.com website is offline, therefore the parser can not be used anymore. The `intelmqctl upgrade-config` command warns if you have the feed and the bot in use.
38+
The postgresql output bot was removed. The bot was marked as deprecated in 2019 and announced to be removed in version 3.
3839

3940
### Data Format
4041

intelmq/bots/outputs/postgresql/output.py

Lines changed: 0 additions & 25 deletions
This file was deleted.

intelmq/tests/bots/outputs/sql/test_output_postgresql.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import intelmq.lib.test as test
1010
from intelmq.bots.outputs.sql.output import SQLOutputBot
11-
from intelmq.bots.outputs.postgresql.output import PostgreSQLOutputBot
1211

1312
if os.environ.get('INTELMQ_TEST_DATABASES'):
1413
import psycopg2
@@ -92,9 +91,10 @@ class TestPostgreSQLOutputBot(test.BotTestCase, unittest.TestCase):
9291

9392
@classmethod
9493
def set_bot(cls):
95-
cls.bot_reference = PostgreSQLOutputBot
94+
cls.bot_reference = SQLOutputBot
9695
cls.default_input_message = INPUT1
97-
cls.sysconfig = {"host": "localhost",
96+
cls.sysconfig = {"engine": "postgresql",
97+
"host": "localhost",
9898
"port": 5432,
9999
"database": "intelmq",
100100
"user": "intelmq",

0 commit comments

Comments
 (0)