Update the base uri and authorization

Co-authored-by: Rakhi Mundhada <rakhi.mundhada@rakhi.mundhada-C02G237CMD6M>

Author: rakhimundhada15

collectors/ciscomeraki/README.md

@@ -26,17 +26,22 @@ Instructions for setting up log collection from Cisco Meraki Dashboard using its
    - Navigate to *Organization > Settings*.
    - Under *Dashboard API access*, enable API access ![ScreenShot](./docs/Ciscomeraki_img1.png).
 
-2. **Generate API Key**:
+2. **Select Base URL**:
+   - In most regions, every API request will begin with the following base URI:
+    `https://api.meraki.com/api/v1`
+   - If your organization’s dashboard is hosted in a specific country, please use the corresponding base URI for that region. Refere to the [Cisco Meraki Dashboard Base URI](https://developer.cisco.com/meraki/api-v1/getting-started/#base-uri) for the appropriate endpoint.
+
+3. **Generate API Key**:
    - Go to *My Profile*.
    - Under *API access*, generate a new API key ![ScreenShot](./docs/Ciscomeraki_img2.png).
 
-3. **Collect Network Events**:
+4. **Collect Network Events**:
    - Refer to the [Cisco Meraki Dashboard API documentation](https://developer.cisco.com/meraki/api/) for details on how to use the API to retrieve [network events](https://developer.cisco.com/meraki/api-v1/get-network-events/).
    - Example API endpoint: `GET /organizations/{organizationId}/networks/{networkId}/events`
 
-4. **Handle Authentication**:
-   - Include your API key in the request headers for authentication.
-   - Example: `X-Cisco-Meraki-API-Key: YOUR_API_KEY`
+5. **Handle Authentication**:
+   - Dashboard API v1 supports Bearer Auth using the standard Authorization header parameter. The value will be a string that begins with the word Bearer, followed by your Meraki API key.
+   - Example: `Authorization: Bearer {API_KEY}`
 
 ### Rate Limits
 - Cisco Meraki Dashboard imposes rate limits on API requests to ensure fair usage and prevent abuse. Refer to the [Rate Limits documentation](https://developer.cisco.com/meraki/api-v1/rate-limit/) for details on the specific limits for different endpoints.

collectors/ciscomeraki/cfn/ciscomeraki-collector.template

@@ -52,7 +52,7 @@
             "Default": "none"
         },
         "CiscoMerakiEndpoint": {
-            "Description": "Cisco Meraki API URL to poll.  For Example https://n149.meraki.com/api/v1",
+            "Description": "Cisco Meraki API URL to poll.  For Example https://api.meraki.com/api/v1",
             "Type": "String"
         },
         "CiscoMerakiClientId": {

collectors/ciscomeraki/collector.js

@@ -19,6 +19,8 @@ const AlLogger = require('@alertlogic/al-aws-collector-js').Logger;
 const MAX_POLL_INTERVAL = 900;
 const API_THROTTLING_ERROR = 429;
 const API_NOT_FOUND_ERROR = 404;
+const CISCO_MERAKI_API_BASE_URL = "api.meraki.com";
+const CISCO_MERAKI_SUB_STRING = "api";
 const NOT_FOUND_ERROR_MAX_RETRIES = 3;
 const typeIdPaths = [{ path: ["type"] }];
 const tsPaths = [{ path: ["occurredAt"] }];
@@ -27,7 +29,7 @@ class CiscomerakiCollector extends PawsCollector {
     constructor(context, creds) {
         super(context, creds, packageJson.version);
         this.productTypes = process.env.paws_collector_param_string_1 ? JSON.parse(process.env.paws_collector_param_string_1) : [];
-        this.apiEndpoint = process.env.paws_endpoint.replace(/^https:\/\/|\/$/g, '');
+        this.apiEndpoint = process.env.paws_endpoint.includes(CISCO_MERAKI_SUB_STRING) ? process.env.paws_endpoint.replace(/^https:\/\/|\/$/g, '') : CISCO_MERAKI_API_BASE_URL;
         this.orgKey = process.env.paws_collector_param_string_2;
     }
 

collectors/ciscomeraki/meraki_client.js

@@ -66,7 +66,7 @@ async function getAPILogs(apiDetails, accumulator, apiEndpoint, state, clientSec
 }
 
 async function makeApiCall(url, apiKey, perPage, productType, startingAfter = null) {
-    let fullUrl = `${url}`
+    let fullUrl = `${url}`;
 
     if (perPage) {
         fullUrl += `?perPage=${perPage}`;
@@ -81,7 +81,7 @@ async function makeApiCall(url, apiKey, perPage, productType, startingAfter = nu
     try {
         const response = await axios.get(fullUrl, {
             headers: {
-                "X-Cisco-Meraki-API-Key": apiKey,
+                "Authorization": `Bearer ${apiKey}`,
                 "Accept": "application/json"
             },
         });
@@ -92,13 +92,12 @@ async function makeApiCall(url, apiKey, perPage, productType, startingAfter = nu
 }
 
 async function listNetworkIds(payloadObj) {
-    const resourcePath = `/api/v1/organizations/${payloadObj.orgKey}/networks`;
-
+    const resourcePath = `api/v1/organizations/${payloadObj.orgKey}/networks`;
     try {
         const networks = await fetchAllNetworks(resourcePath, payloadObj.clientSecret, payloadObj.apiEndpoint);
         return networks.map(network => network.id);
     } catch (error) {
-        return error;
+        throw error;
     }
 }
 

collectors/ciscomeraki/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ciscomeraki-collector",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "Alert Logic AWS based Cisco Meraki Log Collector",
   "repository": {},
   "private": true,

ps_spec.yml

@@ -139,7 +139,7 @@ stages:
       - ./build_collector.sh ciscomeraki
     env:
       ALPS_SERVICE_NAME: "paws-ciscomeraki-collector"
-      ALPS_SERVICE_VERSION: "1.0.12" #set the value from collector package json
+      ALPS_SERVICE_VERSION: "1.0.13" #set the value from collector package json
     outputs:
       file: ./ciscomeraki-collector*
     packagers: