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

Jump to bottom

Add support for "vendor" field #96

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for "vendor" field #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion bin/pd-send
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ def build_queue_arg_parser(description):
"-u", "--client-url", dest="client_url",
help="Client URL"
)
parser.add_argument(
"-v", "--vendor", dest="vendor",
help="Vendor"
)
parser.add_argument(
"-f", "--field", action="append", dest="fields",
help="Add given KEY=VALUE pair to the event details"
Expand Down Expand Up @@ -96,7 +100,7 @@ def main():
incident_key, problems = queue_event(
enqueuer,
args.event_type, args.service_key, args.incident_key, args.description,
args.client, args.client_url, details,
args.client, args.client_url, args.vendor, details,
agent_config.get_agent_id(), "pd-send",
)
if not args.quiet:
Expand Down
13 changes: 8 additions & 5 deletions pdagent/pdagentutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,17 @@ def utcnow_isoformat(time_calc=None):

def queue_event(
enqueuer,
event_type, service_key, incident_key, description, client, client_url, details,
agent_id, queued_by,
event_type, service_key, incident_key, description, client, client_url,
vendor, details, agent_id, queued_by,
):
agent_context = {
"agent_id": agent_id,
"queued_by": queued_by,
"queued_at": utcnow_isoformat()
}
event = _build_event_json_str(
event_type, service_key, incident_key, description, client, client_url, details,
event_type, service_key, incident_key, description, client, client_url,
vendor, details,
agent_context
)
_, problems = enqueuer.enqueue(service_key, event)
Expand All @@ -97,8 +98,8 @@ def get_stats(queue, service_key):


def _build_event_json_str(
event_type, service_key, incident_key, description, client, client_url, details,
agent_context=None
event_type, service_key, incident_key, description, client, client_url,
vendor, details, agent_context=None
):
d = {
"service_key": service_key,
Expand All @@ -113,6 +114,8 @@ def _build_event_json_str(
d["client"] = client
if client_url is not None:
d["client_url"] = client_url
if vendor is not None:
d["vendor"] = vendor
if agent_context is not None:
d["agent"] = agent_context

Expand Down
1 change: 1 addition & 0 deletions pdagenttest/test_sendevent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"description": "test",
"client": "PagerDuty",
"client_url": "http://www.pagerduty.com",
"vendor": "acme",
"details": {}
})

Expand Down
2 changes: 1 addition & 1 deletion pdagenttestinteg/test_20_process.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ sudo sed -i "s#^\#send_interval_secs.*#send_interval_secs=$SEND_INTERVAL_SECS#"
# agent must flush out queue when it starts up.
test_startup() {
i_key="test1"
$BIN_PD_SEND -k $SVC_KEY -t trigger -i $i_key -d "Test incident 1" -f key1=value1 -f key2=subkey=subvalue -c "PagerDuty" -u "https://www.pagerduty.com"
$BIN_PD_SEND -k $SVC_KEY -t trigger -i $i_key -d "Test incident 1" -f key1=value1 -f key2=subkey=subvalue -c "PagerDuty" -u "https://www.pagerduty.com" -v "acme"

test $(sudo find $OUTQUEUE_DIR -type f | wc -l) -eq 1
queued_file=$(sudo find $OUTQUEUE_DIR -type f )
Expand Down