Skip to content

Commit

Permalink
Remove postgresql output bot
Browse files Browse the repository at this point in the history
... 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.
  • Loading branch information
Birger Schacht authored and Birger Schacht committed Aug 18, 2021
1 parent 9d4baa8 commit ff7d835
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 28 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ CHANGELOG
#### Outputs
- `intelmq.bots.outputs.mcafee.output_esm_ip`: Fix access to parameters, the bot wrongly used `self.parameters` (by Sebastian Wagner).
- `intelmq.bots.outputs.misp.output_api`: Fix access to parameters, the bot wrongly used `self.parameters` (by Sebastian Wagner).
- 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).

### Documentation
- Various formatting fixes (by Sebastian Wagner).
Expand Down
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ Please refer to the changelog for a full list of changes.

### Bots
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.
The postgresql output bot was removed. The bot was marked as deprecated in 2019 and announced to be removed in version 3.

### Data Format

Expand Down
25 changes: 0 additions & 25 deletions intelmq/bots/outputs/postgresql/output.py

This file was deleted.

6 changes: 3 additions & 3 deletions intelmq/tests/bots/outputs/sql/test_output_postgresql.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

import intelmq.lib.test as test
from intelmq.bots.outputs.sql.output import SQLOutputBot
from intelmq.bots.outputs.postgresql.output import PostgreSQLOutputBot

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

@classmethod
def set_bot(cls):
cls.bot_reference = PostgreSQLOutputBot
cls.bot_reference = SQLOutputBot
cls.default_input_message = INPUT1
cls.sysconfig = {"host": "localhost",
cls.sysconfig = {"engine": "postgresql",
"host": "localhost",
"port": 5432,
"database": "intelmq",
"user": "intelmq",
Expand Down

0 comments on commit ff7d835

Please sign in to comment.