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.

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 callback plugin types #5761

Merged
merged 1 commit into from
Jan 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions changelogs/fragments/5761-callback-types.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
bugfixes:
- "loganalytics callback plugin - adjust type of callback to ``notification``, it was incorrectly classified as ``aggregate`` before (https://github.com/ansible-collections/community.general/pull/5761)."
- "logdna callback plugin - adjust type of callback to ``notification``, it was incorrectly classified as ``aggregate`` before (https://github.com/ansible-collections/community.general/pull/5761)."
- "logstash callback plugin - adjust type of callback to ``notification``, it was incorrectly classified as ``aggregate`` before (https://github.com/ansible-collections/community.general/pull/5761)."
- "splunk callback plugin - adjust type of callback to ``notification``, it was incorrectly classified as ``aggregate`` before (https://github.com/ansible-collections/community.general/pull/5761)."
- "sumologic callback plugin - adjust type of callback to ``notification``, it was incorrectly classified as ``aggregate`` before (https://github.com/ansible-collections/community.general/pull/5761)."
- "syslog_json callback plugin - adjust type of callback to ``notification``, it was incorrectly classified as ``aggregate`` before (https://github.com/ansible-collections/community.general/pull/5761)."
4 changes: 2 additions & 2 deletions plugins/callback/loganalytics.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

DOCUMENTATION = '''
name: loganalytics
type: aggregate
type: notification
short_description: Posts task results to Azure Log Analytics
author: "Cyrus Li (@zhcli) <[email protected]>"
description:
Expand Down Expand Up @@ -155,7 +155,7 @@ def send_event(self, workspace_id, shared_key, state, result, runtime):

class CallbackModule(CallbackBase):
CALLBACK_VERSION = 2.0
CALLBACK_TYPE = 'aggregate'
CALLBACK_TYPE = 'notification'
CALLBACK_NAME = 'loganalytics'
CALLBACK_NEEDS_WHITELIST = True

Expand Down
4 changes: 2 additions & 2 deletions plugins/callback/logdna.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
DOCUMENTATION = '''
author: Unknown (!UNKNOWN)
name: logdna
type: aggregate
type: notification
short_description: Sends playbook logs to LogDNA
description:
- This callback will report logs from playbook actions, tasks, and events to LogDNA (https://app.logdna.com)
Expand Down Expand Up @@ -111,7 +111,7 @@ def isJSONable(obj):
class CallbackModule(CallbackBase):

CALLBACK_VERSION = 0.1
CALLBACK_TYPE = 'aggregate'
CALLBACK_TYPE = 'notification'
CALLBACK_NAME = 'community.general.logdna'
CALLBACK_NEEDS_WHITELIST = True

Expand Down
2 changes: 1 addition & 1 deletion plugins/callback/logstash.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
class CallbackModule(CallbackBase):

CALLBACK_VERSION = 2.0
CALLBACK_TYPE = 'aggregate'
CALLBACK_TYPE = 'notification'
CALLBACK_NAME = 'community.general.logstash'
CALLBACK_NEEDS_WHITELIST = True

Expand Down
4 changes: 2 additions & 2 deletions plugins/callback/splunk.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

DOCUMENTATION = '''
name: splunk
type: aggregate
type: notification
short_description: Sends task result events to Splunk HTTP Event Collector
author: "Stuart Hirst (!UNKNOWN) <[email protected]>"
description:
Expand Down Expand Up @@ -165,7 +165,7 @@ def send_event(self, url, authtoken, validate_certs, include_milliseconds, batch

class CallbackModule(CallbackBase):
CALLBACK_VERSION = 2.0
CALLBACK_TYPE = 'aggregate'
CALLBACK_TYPE = 'notification'
CALLBACK_NAME = 'community.general.splunk'
CALLBACK_NEEDS_WHITELIST = True

Expand Down
4 changes: 2 additions & 2 deletions plugins/callback/sumologic.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

DOCUMENTATION = '''
name: sumologic
type: aggregate
type: notification
short_description: Sends task result events to Sumologic
author: "Ryan Currah (@ryancurrah)"
description:
Expand Down Expand Up @@ -111,7 +111,7 @@ def send_event(self, url, state, result, runtime):

class CallbackModule(CallbackBase):
CALLBACK_VERSION = 2.0
CALLBACK_TYPE = 'aggregate'
CALLBACK_TYPE = 'notification'
CALLBACK_NAME = 'community.general.sumologic'
CALLBACK_NEEDS_WHITELIST = True

Expand Down
2 changes: 1 addition & 1 deletion plugins/callback/syslog_json.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class CallbackModule(CallbackBase):
"""

CALLBACK_VERSION = 2.0
CALLBACK_TYPE = 'aggregate'
CALLBACK_TYPE = 'notification'
CALLBACK_NAME = 'community.general.syslog_json'
CALLBACK_NEEDS_WHITELIST = True

Expand Down