Merge branch 'develop'

README.md

@@ -120,6 +120,8 @@ You can also pipe the command to another process like your favorite JSON parser
 $ akamai etp event aup --start 1576877365 --end 1576878265|jq .
 ```
 
+Other event available are DNS activity (use `dns`) and Proxy Traffic (use `proxy`)
+
 ### Manage security lists
 
 Get the lists available on the account

bin/akamai-etp

@@ -35,7 +35,7 @@ from requests.compat import urljoin
 from akamai.edgegrid import EdgeGridAuth, EdgeRc
 from config import EdgeGridConfig
 
-__version__ = "0.3.2"
+__version__ = "0.3.3"
 
 #: Data collection delay, default is 30 minutes
 collection_delay_min = 30
@@ -155,6 +155,20 @@ def build_params(params=None):
     return final_params
 
 
+def input2feed(event_type):
+    api_eventtype = None
+    if event_type == "threat":
+        api_eventtype = "threat-events"
+    elif event_type == "aup":
+        api_eventtype = "aup-events"
+    elif event_type == "dns":
+        api_eventtype = "dns-activities"
+    elif event_type == "proxy":
+        api_eventtype = "proxy-traffic/transactions"
+    if api_eventtype is None:
+        raise ValueError(f'event_type provided is support supported: {event_type}')
+    return api_eventtype
+
 def fetch_events(config, output):
     """
     Fetch all events
@@ -193,11 +207,11 @@ def fetch_events(config, output):
                 }
 
                 timing_s = time.time()  # The fetch operation can take a while
-                event_url = '%(baseurl)s/etp-report/v3/configs/%(config_id)s/%(event_type)s-events/details' % \
+                event_url = '%(baseurl)s/etp-report/v3/configs/%(config_id)s/%(event_type)s/details' % \
                     {
                         'baseurl': baseurl,
                         'config_id': config.etp_config_id,
-                        'event_type': config.event_type
+                        'event_type': input2feed(config.event_type)
                     }
                 LOG.info("{OPEN} API URL: %s" % event_url)
                 LOG.info("{OPEN} API POST param %s" % post_data)

bin/config.py

@@ -49,7 +49,7 @@ def __init__(self, config_values, configuration, flags=None):
         event_parser = subparsers.add_parser("event", help="Fetch last events (from 1h15 ago to 1 hour ago)",
                                              epilog=epilog, formatter_class=argparse.RawTextHelpFormatter)
         event_parser.add_argument('event_type', nargs='?', default="threat", 
-                                  choices=['threat', 'aup'], help="Event type, threat or Acceptable User Policy (AUP)")
+                                  choices=['threat', 'aup', 'dns', 'proxy'], help="Event type, Threat, Acceptable User Policy (AUP), DNS or Proxy")
         event_parser.add_argument('--start', '-s', type=int, help="Start datetime (EPOCH),\nDefault is 1h15 ago")
         event_parser.add_argument('--end', '-e', type=int, help="End datetime (EPOCH),\nDefault is start + 15 minutes")
         event_parser.add_argument('--output', '-o', help="Output file, default is stdout. Encoding is utf-8.")

cli.json

@@ -5,7 +5,7 @@
   "commands": [
     {
       "name": "etp",
-      "version": "0.3.2",
+      "version": "0.3.3",
       "description": "Akamai CLI for Enterprise Threat Protector"
     }
   ]