Merge pull request #130 from SumoLogic/sourabh-aws-observability

Sourabh aws observability

Author: SumoSourabh

sumologic-app-utils/Test/SampleTemplate.yaml

@@ -48,7 +48,7 @@ Resources:
     Properties:
       Location:
         ApplicationId: arn:aws:serverlessrepo:us-east-1:956882708938:applications/sumologic-app-utils
-        SemanticVersion: 2.0.5
+        SemanticVersion: 2.0.6
 
   SumoLogicHelperPolicy:
     Type: AWS::IAM::Policy
@@ -245,6 +245,19 @@ Resources:
       SumoAccessKey: !Ref Section1cSumoAccessKey
       SumoDeployment: !Ref Section1aSumoDeployment
 
+  sumoAppWithCustomURL:
+    Type: Custom::App
+    Properties:
+      ServiceToken: !GetAtt SumoAppUtils.Outputs.SumoAppUtilsFunction
+      Region: !Ref "AWS::Region"
+      AppName: "AWS Observability Api Gateway App"
+      FolderName: "My App with custom URL"
+      RemoveOnDeleteStack: !Ref Section1eRemoveSumoResourcesOnDeleteStack
+      SumoAccessID: !Ref Section1bSumoAccessID
+      SumoAccessKey: !Ref Section1cSumoAccessKey
+      SumoDeployment: !Ref Section1aSumoDeployment
+      AppJsonS3Url: "https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.1.0/appjson/Alb-App.json"
+
   sumoAppwithUID:
     Type: Custom::App
     DependsOn: sumoApp
@@ -357,6 +370,20 @@ Resources:
       AccountID: !Ref "AWS::AccountId"
       RemoveOnDeleteStack: !Ref Section1eRemoveSumoResourcesOnDeleteStack
 
+  sumoMonitorAlerts:
+    Type: Custom::AlertsMonitor
+    Properties:
+      ServiceToken: !GetAtt SumoAppUtils.Outputs.SumoAppUtilsFunction
+      Region: !Ref "AWS::Region"
+      FolderName: !Sub "Test Monitors"
+      MonitorsS3Url: !Sub "https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.1.0/appjson/Alerts-App.json"
+      SuffixDateTime: true
+      RetainOldAlerts: true
+      RemoveOnDeleteStack: !Ref Section1eRemoveSumoResourcesOnDeleteStack
+      SumoAccessID: !Ref Section1bSumoAccessID
+      SumoAccessKey: !Ref Section1cSumoAccessKey
+      SumoDeployment: !Ref Section1aSumoDeployment
+
 Outputs:
   EnterpriseCheck:
     Description: "Check If Account is Enterprise or Not"

sumologic-app-utils/deploy.sh

@@ -26,7 +26,7 @@ if [ ! -f sumo_app_utils.zip ]; then
     rm -r python
 fi
 
-version="2.0.5"
+version="2.0.6"
 
 aws s3 cp sumo_app_utils.zip s3://$SAM_S3_BUCKET/sumo_app_utils/v"$version"/sumo_app_utils.zip --region $AWS_REGION --acl public-read
 

sumologic-app-utils/packaged_sumo_app_utils.yaml

@@ -20,17 +20,17 @@ Metadata:
     - sumologic
     - serverless
     Name: sumologic-app-utils
-    SemanticVersion: 2.0.5
+    SemanticVersion: 2.0.6
     SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/master/sumologic-app-utils
     SpdxLicenseId: Apache-2.0
-    ReadmeUrl: s3://appdevstore/sumo_app_utils/v2.0.5/4d5a92c06a7fa9d956a900e51a1f6be4
+    ReadmeUrl: s3://appdevstore/sumo_app_utils/v2.0.6/4d5a92c06a7fa9d956a900e51a1f6be4
 Resources:
   SumoAppUtilsFunction:
     Type: AWS::Serverless::Function
     Properties:
       Handler: main.handler
       Runtime: python3.7
-      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.5/sumo_app_utils.zip
+      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.6/sumo_app_utils.zip
       MemorySize: 128
       Timeout: 300
       Policies:

sumologic-app-utils/src/main.py

@@ -4,7 +4,7 @@
 
 from resourcefactory import ResourceFactory
 
-helper = CfnResource(json_logging=False, log_level='INFO')
+helper = CfnResource(json_logging=False, log_level='INFO', sleep_on_delete=30)
 
 
 def get_resource(event):

sumologic-app-utils/src/sumologic.py

@@ -17,9 +17,10 @@ class SumoLogic(object):
 
     def __init__(self, accessId, accessKey, endpoint=None, cookieFile='cookies.txt'):
         self.session = requests.Session()
-        retries = Retry(total=3, backoff_factor=0.1, status_forcelist=[502, 503, 504, 429])
-        self.session.mount('https://', HTTPAdapter(max_retries=retries))
-        self.session.mount('http://', HTTPAdapter(max_retries=retries))
+        retries = Retry(total=3, backoff_factor=1, status_forcelist=[500, 502, 503, 504, 429])
+        adapter = HTTPAdapter(max_retries=retries)
+        self.session.mount('https://', adapter)
+        self.session.mount('http://', adapter)
         self.session.auth = (accessId, accessKey)
         self.session.headers = {'content-type': 'application/json', 'accept': 'application/json'}
         cj = cookielib.FileCookieJar(cookieFile)
@@ -299,4 +300,19 @@ def get_existing_field(self, field_id):
         return json.loads(response.text)
 
     def delete_existing_field(self, field_id):
-        return self.delete('/fields/%s' % field_id)
+        return self.delete('/fields/%s' % field_id)
+
+    def import_monitors(self, folder_id, content):
+        response = self.post('/monitors/%s/import' % folder_id, params=content)
+        return json.loads(response.text)
+
+    def export_monitors(self, folder_id):
+        response = self.get('/monitors/%s/export' % folder_id)
+        return json.loads(response.text)
+
+    def get_root_folder(self):
+        response = self.get('/monitors/root')
+        return json.loads(response.text)
+
+    def delete_monitor_folder(self, folder_id):
+        return self.delete('/monitors/%s' % folder_id)