Don't exit if already resolved

mass_update_incidents/mass_update_incidents.py

@@ -3,14 +3,12 @@
 # PagerDuty Support asset: mass_update_incidents
 
 import argparse
-import requests
 import sys
-import json
-from datetime import date
-import pprint
+import time
+from concurrent.futures import ThreadPoolExecutor as PoolExecutor
 
 import pdpyras
-import time
+from ratelimit import limits, sleep_and_retry
 
 # Default parameters:
 PARAMETERS = {
@@ -21,18 +19,19 @@
     # 'time_zone': `UTC`
 }
 
+
 def mass_update_incidents(args):
     session = pdpyras.APISession(args.api_key,
-        default_from=args.requester_email)
-    session.headers.update({"X-SOURCE-SCRIPT": "pupblic-support-scripts/mass_update_incidents"})
+                                 default_from=args.requester_email)
+    session.headers.update({"X-SOURCE-SCRIPT": "public-support-scripts/mass_update_incidents"})
 
     if args.user_id:
         PARAMETERS['user_ids[]'] = args.user_id.split(',')
-        print("Acting on incidents assigned to user(s): "+args.user_id)
+        print("Acting on incidents assigned to user(s): " + args.user_id)
     if args.service_id:
         PARAMETERS['service_ids[]'] = args.service_id.split(',')
         print("Acting on incidents corresponding to service ID(s): " +
-            args.service_id)
+              args.service_id)
     if args.action == 'resolve':
         PARAMETERS['statuses[]'] = ['triggered', 'acknowledged']
         print("Resolving incidents")
@@ -43,60 +42,81 @@ def mass_update_incidents(args):
         sinceuntil = args.date_range.split(',')
         if len(sinceuntil) != 2:
             raise ValueError("Date range must be two ISO8601-formatted time "
-                "stamps separated by a comma.")
+                             "stamps separated by a comma.")
         PARAMETERS['since'] = sinceuntil[0]
         PARAMETERS['until'] = sinceuntil[1]
-        print("Getting incidents for date range: "+" to ".join(sinceuntil))
+        print("Getting incidents for date range: " + " to ".join(sinceuntil))
     else:
         PARAMETERS['date_range'] = 'all'
         print("Getting incidents of all time")
-    print("Parameters: "+str(PARAMETERS))
+    print("Parameters: " + str(PARAMETERS))
     try:
         print("Please be patient as this can take a while for large volumes "
-            "of incidents.")
-        for incident in session.list_all('incidents', params=PARAMETERS):
-            print("* Incident {}: {}".format(incident['id'], args.action))
-            if args.dry_run:
-                continue
-            time.sleep(0.25)
-            self_url =  f"https://api.pagerduty.com/incidents/{incident['id']}"
-            session.rput(self_url, json={
-                'type': 'incident_reference',
-                'id': incident['id'],
-                'status': '{0}d'.format(args.action), # acknowledged or resolved
-            })
+              "of incidents.")
+
+        def curried(incident):
+            return resolve_rate_limited(session, args, incident)
+
+        with PoolExecutor(max_workers=8) as executor:
+            for _ in executor.map(curried, session.list_all('incidents', params=PARAMETERS)):
+                pass
     except pdpyras.PDClientError as e:
         if e.response is not None:
             print(e.response.text)
         raise e
 
+
+ONE_MINUTE = 60
+MAX_CALLS_PER_MINUTE = 110  # Bit less than https://developer.pagerduty.com/docs/ZG9jOjExMDI5NTUz-rate-limiting
+
+
+@sleep_and_retry
+@limits(calls=MAX_CALLS_PER_MINUTE, period=ONE_MINUTE)
+def resolve_rate_limited(session, args, incident):
+    print("* Incident {}: {}".format(incident['id'], args.action))
+    if args.dry_run:
+        return
+    time.sleep(0.25)
+    self_url = f"https://api.pagerduty.com/incidents/{incident['id']}"
+    try:
+        session.rput(self_url, json={
+            'type': 'incident_reference',
+            'id': incident['id'],
+            'status': '{0}d'.format(args.action),  # acknowledged or resolved
+        })
+    except pdpyras.PDClientError as e:
+        print(e.response.text)
+        pass
+
+
 def main(argv=None):
     ap = argparse.ArgumentParser(description="Mass ack or resolve incidents "
-        "either corresponding to a given service, or assigned to a given "
-        "user. Note, if you are trying to update over 10k incidents at a "
-        "time, you should set the --date-range argument to a lesser interval "
-        "of time and then run this script multiple times with a different "
-        "interval each time until the desired range of time is covered.")
+                                             "either corresponding to a given service, or assigned to a given "
+                                             "user. Note, if you are trying to update over 10k incidents at a "
+                                             "time, you should set the --date-range argument to a lesser interval "
+                                             "of time and then run this script multiple times with a different "
+                                             "interval each time until the desired range of time is covered.")
     ap.add_argument('-d', '--date-range', default=None, help="Only act on "
-        "incidents within a date range. Must be a pair of ISO8601-formatted "
-        "time stamps, separated by a comma, representing the beginning (since) "
-        "and end (until) of the date range. By default, incidents of all time "
-        "will be updated.")
+                                                             "incidents within a date range. Must be a pair of ISO8601-formatted "
+                                                             "time stamps, separated by a comma, representing the beginning (since) "
+                                                             "and end (until) of the date range. By default, incidents of all time "
+                                                             "will be updated.")
     ap.add_argument('-k', '--api-key', required=True, help="REST API key")
     ap.add_argument('-n', '--dry-run', default=False, action='store_true',
-        help="Do not perform the actions but show what will happen.")
+                    help="Do not perform the actions but show what will happen.")
     ap.add_argument('-s', '--service-id', default=None, help="ID of the "
-        "service, or comma-separated list of services, for which incidents "
-        "should be updated; leave blank to match all services.")
+                                                             "service, or comma-separated list of services, for which incidents "
+                                                             "should be updated; leave blank to match all services.")
     ap.add_argument('-u', '--user-id', default=None, help="ID of user, "
-        "or comma-separated list of users, whose assigned incidents should be "
-        "included in the action. Leave blank to match incidents for all users.")
+                                                          "or comma-separated list of users, whose assigned incidents should be "
+                                                          "included in the action. Leave blank to match incidents for all users.")
     ap.add_argument('-a', '--action', default='resolve', choices=['acknowledge',
-        'resolve'], help="Action to take on incidents en masse")
+                                                                  'resolve'], help="Action to take on incidents en masse")
     ap.add_argument('-e', '--requester-email', required=True, help="Email "
-        "address of the user who will be marked as performing the actions.")
+                                                                   "address of the user who will be marked as performing the actions.")
     args = ap.parse_args()
     mass_update_incidents(args)
 
-if __name__=='__main__':
+
+if __name__ == '__main__':
     sys.exit(main())

mass_update_incidents/requirements.txt

@@ -1 +1,2 @@
-pdpyras >= 2.0.0
+pdpyras~=3.0.0
+ratelimit>=2.2.1