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.

Sign up for GitHub

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

Fix chatwork alerter #224

Merged
merged 2 commits into from
Jun 4, 2021
Merged

Fix chatwork alerter #224

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7809dce
Fix chatwork alerter
nsano-rururu Jun 4, 2021
803de30
Merge branch 'master' into bugfix_chatwork
jertel Jun 4, 2021
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
4 changes: 2 additions & 2 deletions elastalert/alerters/chatwork.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ class ChatworkAlerter(Alerter):

def __init__(self, rule):
super(ChatworkAlerter, self).__init__(rule)
self.chatwork_apikey = self.rule.get('chatwork_apikey')
self.chatwork_room_id = self.rule.get('chatwork_room_id')
self.chatwork_apikey = self.rule['chatwork_apikey']
self.chatwork_room_id = self.rule['chatwork_room_id']
self.url = 'https://api.chatwork.com/v2/rooms/%s/messages' % (self.chatwork_room_id)
self.chatwork_proxy = self.rule.get('chatwork_proxy', None)
self.chatwork_proxy_login = self.rule.get('chatwork_proxy_login', None)
Expand Down
54 changes: 54 additions & 0 deletions tests/alerters/chatwork_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,3 +101,57 @@ def test_chatwork_ea_exception():
alert.alert([match])
except EAException:
assert True


def test_chatwork_getinfo():
rule = {
'name': 'Test Chatwork Rule',
'type': 'any',
'chatwork_apikey': 'xxxx1',
'chatwork_room_id': 'xxxx2',
'alert': []
}
rules_loader = FileRulesLoader({})
rules_loader.load_modules(rule)
alert = ChatworkAlerter(rule)

expected_data = {
"type": "chatwork",
"chatwork_room_id": "xxxx2"
}
actual_data = alert.get_info()
assert expected_data == actual_data


@pytest.mark.parametrize('chatwork_apikey, chatwork_room_id, expected_data', [
('', '', True),
('xxxx1', '', True),
('', 'xxxx2', True),
('xxxx1', 'xxxx2',
{
"type": "chatwork",
"chatwork_room_id": "xxxx2"
}),
])
def test_chatwork_key_error(chatwork_apikey, chatwork_room_id, expected_data):
try:
rule = {
'name': 'Test Chatwork Rule',
'type': 'any',
'alert': []
}

if chatwork_apikey != '':
rule['chatwork_apikey'] = chatwork_apikey

if chatwork_room_id != '':
rule['chatwork_room_id'] = chatwork_room_id

rules_loader = FileRulesLoader({})
rules_loader.load_modules(rule)
alert = ChatworkAlerter(rule)

actual_data = alert.get_info()
assert expected_data == actual_data
except KeyError:
assert expected_data