Audit Synthetics plugin log levels

x-pack/solutions/observability/plugins/synthetics/server/routes/default_alerts/default_alert_service.ts

@@ -259,8 +259,8 @@ export class DefaultAlertService {
     let actionConnectors: FindActionResult[] = [];
     try {
       actionConnectors = await actionsClient.getAll();
-    } catch (e) {
-      this.server.logger.error(e);
+    } catch (error) {
+      this.server.logger.error(`Error getting connectors, Error: ${error.message}`, { error });
     }
     return { actionConnectors, settings: this.settings };
   }

x-pack/solutions/observability/plugins/synthetics/server/routes/default_alerts/update_default_alert.ts

@@ -37,8 +37,10 @@ export const updateDefaultAlertingRoute: SyntheticsRestApiRouteFactory = () => (
         statusRule: statusRule || null,
         tlsRule: tlsRule || null,
       };
-    } catch (e) {
-      server.logger.error(`Error updating default alerting rules: ${e}`);
+    } catch (error) {
+      server.logger.error(`Error updating default alerting rules, Error: ${error.message}`, {
+        error,
+      });
       return {
         statusRule: null,
         tlsRule: null,

x-pack/solutions/observability/plugins/synthetics/server/routes/monitor_cruds/add_monitor.ts

@@ -122,17 +122,17 @@ export const addSyntheticsMonitorRoute: SyntheticsRestApiRouteFactory = () => ({
       addMonitorAPI.setupGettingStarted(newMonitor.id);
 
       return mapSavedObjectToMonitor({ monitor: newMonitor, internal });
-    } catch (getErr) {
-      server.logger.error(getErr);
-      if (getErr instanceof InvalidLocationError || getErr instanceof InvalidScheduleError) {
-        return response.badRequest({ body: { message: getErr.message } });
+    } catch (error) {
+      if (error instanceof InvalidLocationError || error instanceof InvalidScheduleError) {
+        return response.badRequest({ body: { message: error.message } });
       }
-      if (SavedObjectsErrorHelpers.isForbiddenError(getErr)) {
-        return response.forbidden({ body: getErr });
+      if (SavedObjectsErrorHelpers.isForbiddenError(error)) {
+        return response.forbidden({ body: error });
       }
 
+      server.logger.error('Unable to create synthetics monitor', { error });
       return response.customError({
-        body: { message: getErr.message },
+        body: { message: error.message },
         statusCode: 500,
       });
     }

x-pack/solutions/observability/plugins/synthetics/server/routes/monitor_cruds/add_monitor/add_monitor_api.ts

@@ -85,10 +85,7 @@ export class AddEditMonitorAPI {
       const [monitorSavedObjectN, [packagePolicyResult, syncErrors]] = await Promise.all([
         newMonitorPromise,
         syncErrorsPromise,
-      ]).catch((e) => {
-        server.logger.error(e);
-        throw e;
-      });
+      ]);
 
       if (packagePolicyResult && (packagePolicyResult?.failed?.length ?? []) > 0) {
         const failed = packagePolicyResult.failed.map((f) => f.error);
@@ -116,15 +113,11 @@ export class AddEditMonitorAPI {
         },
       };
     } catch (e) {
-      server.logger.error(
-        `Unable to create Synthetics monitor ${monitorWithNamespace[ConfigKey.NAME]}`
-      );
+      e.message = `${e.message}, monitor name: ${monitorWithNamespace[ConfigKey.NAME]}`;
       await this.revertMonitorIfCreated({
         newMonitorId,
       });
 
-      server.logger.error(e);
-
       throw e;
     }
   }
@@ -234,10 +227,12 @@ export class AddEditMonitorAPI {
           server.logger.debug(`Successfully created default alert for monitor: ${name}`);
         })
         .catch((error) => {
-          server.logger.error(`Error creating default alert: ${error} for monitor: ${name}`);
+          server.logger.error(`Error creating default alert: ${error} for monitor: ${name}`, {
+            error,
+          });
         });
-    } catch (e) {
-      server.logger.error(`Error creating default alert: ${e} for monitor: ${name}`);
+    } catch (error) {
+      server.logger.error(`Error creating default alert: ${error} for monitor: ${name}`, { error });
     }
   }
 
@@ -253,13 +248,19 @@ export class AddEditMonitorAPI {
           .then(() => {
             server.logger.debug(`Successfully triggered test for monitor: ${configId}`);
           })
-          .catch((e) => {
-            server.logger.error(`Error triggering test for monitor: ${configId}: ${e}`);
+          .catch((error) => {
+            server.logger.error(
+              `Error triggering test for monitor: ${configId}, Error: ${error.message}`,
+              {
+                error,
+              }
+            );
           });
       }
-    } catch (e) {
-      server.logger.info(`Error triggering test for getting started monitor: ${configId}`);
-      server.logger.error(e);
+    } catch (error) {
+      server.logger.error(`Error triggering test for getting started monitor: ${configId}`, {
+        error,
+      });
     }
   };
 
@@ -311,9 +312,14 @@ export class AddEditMonitorAPI {
           monitorIds: [newMonitorId],
         });
       }
-    } catch (e) {
+    } catch (error) {
       // ignore errors here
-      server.logger.error(e);
+      server.logger.error(
+        `Unable to revert monitor with id ${newMonitorId}, Error: ${error.message}`,
+        {
+          error,
+        }
+      );
     }
   }
 }

x-pack/solutions/observability/plugins/synthetics/server/routes/monitor_cruds/bulk_cruds/add_monitor_bulk.ts

@@ -125,9 +125,9 @@ const rollBackNewMonitorBulk = async (
     await deleteMonitorAPI.execute({
       monitorIds: monitorsToCreate.map(({ id }) => id),
     });
-  } catch (e) {
+  } catch (error) {
     // ignore errors here
-    server.logger.error(e);
+    server.logger.error(`Unable to rollback new monitors, Error: ${error.message}`, { error });
   }
 };
 
@@ -169,6 +169,6 @@ export const deleteMonitorIfCreated = async ({
     }
   } catch (e) {
     // ignore errors here
-    server.logger.error(e);
+    server.logger.error(`Unable to delete monitor with id ${newMonitorId}`, { error: e });
   }
 };

x-pack/solutions/observability/plugins/synthetics/server/routes/monitor_cruds/bulk_cruds/edit_monitor_bulk.ts

@@ -119,7 +119,6 @@ export const syncEditedMonitorBulk = async ({
       editedMonitors: editedMonitorSavedObjects?.saved_objects,
     };
   } catch (e) {
-    server.logger.error(`Unable to update Synthetics monitors, ${e.message}`);
     await rollbackCompletely({ routeContext, monitorsToUpdate });
     throw e;
   }
@@ -140,8 +139,10 @@ export const rollbackCompletely = async ({
         attributes: decryptedPreviousMonitor.attributes as unknown as MonitorFields,
       })),
     });
-  } catch (e) {
-    server.logger.error(`Unable to rollback Synthetics monitors edit ${e.message} `);
+  } catch (error) {
+    server.logger.error(`Unable to rollback Synthetics monitors edit, Error: ${error.message}`, {
+      error,
+    });
   }
 };
 
@@ -189,7 +190,10 @@ export const rollbackFailedUpdates = async ({
       await monitorConfigRepository.bulkUpdate({ monitors: monitorsToRevert });
     }
     return failedConfigs;
-  } catch (e) {
-    server.logger.error(`Unable to rollback Synthetics monitor failed updates, ${e.message} `);
+  } catch (error) {
+    server.logger.error(
+      `Unable to rollback Synthetics monitor failed updates, Error: ${error.message}`,
+      { error }
+    );
   }
 };

x-pack/solutions/observability/plugins/synthetics/server/routes/monitor_cruds/edit_monitor.ts

@@ -184,21 +184,24 @@ export const editSyntheticsMonitorRoute: SyntheticsRestApiRouteFactory = () => (
           created_at: previousMonitor.created_at,
         },
       });
-    } catch (updateErr) {
-      if (SavedObjectsErrorHelpers.isNotFoundError(updateErr)) {
+    } catch (error) {
+      if (SavedObjectsErrorHelpers.isNotFoundError(error)) {
         return getMonitorNotFoundResponse(response, monitorId);
       }
-      if (updateErr instanceof InvalidLocationError || updateErr instanceof InvalidScheduleError) {
-        return response.badRequest({ body: { message: updateErr.message } });
+      if (error instanceof InvalidLocationError || error instanceof InvalidScheduleError) {
+        return response.badRequest({ body: { message: error.message } });
       }
-      if (updateErr instanceof MonitorValidationError) {
-        const { reason: message, details, payload } = updateErr.result;
+      if (error instanceof MonitorValidationError) {
+        const { reason: message, details, payload } = error.result;
         return response.badRequest({ body: { message, attributes: { details, ...payload } } });
       }
-      logger.error(updateErr);
 
+      logger.error(
+        `Unable to update Synthetics monitor with id ${monitorId}, Error: ${error.message}`,
+        { error }
+      );
       return response.customError({
-        body: { message: updateErr.message },
+        body: { message: error.message },
         statusCode: 500,
       });
     }
@@ -217,8 +220,13 @@ const rollbackUpdate = async ({
   const { savedObjectsClient, server } = routeContext;
   try {
     await savedObjectsClient.update<MonitorFields>(syntheticsMonitorType, configId, attributes);
-  } catch (e) {
-    server.logger.error(`Unable to rollback Synthetics monitors edit ${e.message} `);
+  } catch (error) {
+    server.logger.error(
+      `Unable to rollback edit for Synthetics monitor with id ${configId}, Error: ${error.message}`,
+      {
+        error,
+      }
+    );
   }
 };
 
@@ -265,10 +273,7 @@ export const syncEditedMonitor = async ({
 
     const [editedMonitorSavedObject, { publicSyncErrors, failedPolicyUpdates }] = await Promise.all(
       [editedSOPromise, editSyncPromise]
-    ).catch((e) => {
-      server.logger.error(e);
-      throw e;
-    });
+    );
 
     sendTelemetryEvents(
       server.logger,
@@ -294,9 +299,6 @@ export const syncEditedMonitor = async ({
       },
     };
   } catch (e) {
-    server.logger.error(
-      `Unable to update Synthetics monitor ${decryptedPreviousMonitor.attributes[ConfigKey.NAME]}`
-    );
     await rollbackUpdate({
       routeContext,
       configId: decryptedPreviousMonitor.id,

x-pack/solutions/observability/plugins/synthetics/server/routes/monitor_cruds/inspect_monitor.ts

@@ -91,14 +91,14 @@ export const inspectSyntheticsMonitorRoute: SyntheticsRestApiRouteFactory = () =
       }
 
       return response.ok({ body: { result, decodedCode: formatCode(decodedCode) } });
-    } catch (getErr) {
+    } catch (error) {
       server.logger.error(
-        `Unable to inspect Synthetics monitor ${monitorWithDefaults[ConfigKey.NAME]}`
+        `Unable to inspect Synthetics monitor ${monitorWithDefaults[ConfigKey.NAME]}`,
+        { error }
       );
-      server.logger.error(getErr);
 
       return response.customError({
-        body: { message: getErr.message },
+        body: { message: error.message },
         statusCode: 500,
       });
     }

x-pack/solutions/observability/plugins/synthetics/server/routes/monitor_cruds/project_monitor/add_monitor_project.ts

@@ -80,12 +80,12 @@ export const addSyntheticsProjectMonitorRoute: SyntheticsRestApiRouteFactory = (
         failedMonitors: pushMonitorFormatter.failedMonitors,
       };
     } catch (error) {
-      server.logger.error(`Error adding monitors to project ${decodedProjectName}`);
       if (error.output?.statusCode === 404) {
         const spaceId = server.spaces?.spacesService.getSpaceId(request) ?? DEFAULT_SPACE_ID;
         return response.notFound({ body: { message: `Kibana space '${spaceId}' does not exist` } });
       }
 
+      server.logger.error(`Error adding monitors to project ${decodedProjectName}`, { error });
       throw error;
     }
   },

x-pack/solutions/observability/plugins/synthetics/server/routes/monitor_cruds/project_monitor/get_monitor_project.ts

@@ -67,7 +67,7 @@ export const getSyntheticsProjectMonitorsRoute: SyntheticsRestApiRouteFactory =
         monitors: projectMonitors,
       };
     } catch (error) {
-      logger.error(error);
+      logger.error(`Error getting Synthetics monitors, Error: ${error.message}`, { error });
     }
   },
 });

x-pack/solutions/observability/plugins/synthetics/server/routes/monitor_cruds/services/delete_monitor_api.ts

@@ -71,7 +71,9 @@ export class DeleteMonitorAPI {
           error: `Monitor id ${monitorId} not found!`,
         });
       } else {
-        server.logger.error(`Failed to decrypt monitor to delete ${monitorId}${e}`);
+        server.logger.error(`Failed to decrypt monitor to delete, monitor id: ${monitorId}`, {
+          error: e,
+        });
         sendErrorTelemetryEvents(server.logger, server.telemetry, {
           reason: `Failed to decrypt monitor to delete ${monitorId}`,
           message: e?.message,
@@ -118,10 +120,11 @@ export class DeleteMonitorAPI {
       });
 
       return { errors, result: this.result };
-    } catch (e) {
-      server.logger.error(`Unable to delete Synthetics monitor with error ${e.message}`);
-      server.logger.error(e);
-      throw e;
+    } catch (error) {
+      server.logger.error(`Unable to delete Synthetics monitor with error ${error.message}`, {
+        error,
+      });
+      throw error;
     }
   }
 

x-pack/solutions/observability/plugins/synthetics/server/routes/settings/private_locations/migrate_legacy_private_locations.test.ts

@@ -43,7 +43,8 @@ describe('migrateLegacyPrivateLocations', () => {
     await migrateLegacyPrivateLocations(repositoryMock, loggerMockVal);
 
     expect(loggerMockVal.error).toHaveBeenCalledWith(
-      'Error migrating legacy private locations: Error: Get error'
+      'Error migrating legacy private locations: Get error',
+      { error }
     );
   });
 

x-pack/solutions/observability/plugins/synthetics/server/routes/settings/private_locations/migrate_legacy_private_locations.ts

@@ -64,7 +64,7 @@ export const migrateLegacyPrivateLocations = async (
         {}
       );
     }
-  } catch (e) {
-    logger.error(`Error migrating legacy private locations: ${e}`);
+  } catch (error) {
+    logger.error(`Error migrating legacy private locations: ${error.message}`, { error });
   }
 };