Skip to content

Commit

Permalink
Merge pull request #119 from SumoLogic/awso-v2.5.1
Browse files Browse the repository at this point in the history
AWSO v2.5.1
  • Loading branch information
himsharma01 authored Sep 27, 2022
2 parents 99994d4 + 60b9d6a commit 62ae16d
Show file tree
Hide file tree
Showing 23 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion aws-observability-terraform/field.tf
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ resource "sumologic_field_extraction_rule" "AwsObservabilityGenericCloudWatchLog
| "unknown" as namespace
| if (_sourceHost matches "/aws/lambda/*", "aws/lambda", namespace) as namespace
| if (_sourceHost matches "/aws/rds/*", "aws/rds", namespace) as namespace
| if (_sourceHost matches "/aws/ecs/containerinsights/*", "ecs/containerinsights", namespace) as namespace
| if (_sourceHost matches "/aws/ecs/containerinsights/*", "aws/ecs", namespace) as namespace
| if (_sourceHost matches "/aws/kinesisfirehose/*", "aws/firehose", namespace) as namespace
| fields namespace
EOT
Expand Down
2 changes: 1 addition & 1 deletion aws-observability/apps/alb/alb_app.template.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AWSTemplateFormatVersion: '2010-09-09'
Transform: 'AWS::Serverless-2016-10-31'
Description: "Version - v2.5.0: Template to setup the ALB app with AWS and Sumo Logic resources for AWS Observability Solution."
Description: "Version - v2.5.1: Template to setup the ALB app with AWS and Sumo Logic resources for AWS Observability Solution."

Metadata:
'AWS::CloudFormation::Interface':
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AWSTemplateFormatVersion: '2010-09-09'
Transform: 'AWS::Serverless-2016-10-31'
Description: "Version - v2.5.0: Template to setup the API Gateway app with AWS and Sumo Logic resources for AWS Observability Solution."
Description: "Version - v2.5.1: Template to setup the API Gateway app with AWS and Sumo Logic resources for AWS Observability Solution."

Metadata:
'AWS::CloudFormation::Interface':
Expand Down
4 changes: 2 additions & 2 deletions aws-observability/apps/autoenable/auto_enable.template.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AWSTemplateFormatVersion: '2010-09-09'
Transform: 'AWS::Serverless-2016-10-31'
Description: "Version - v2.5.0: Template to setup Auto Enable ALB Access Logging and Lambda Auto Subscribe Log Groups for AWS Observability Solution."
Description: "Version - v2.5.1: Template to setup Auto Enable ALB Access Logging and Lambda Auto Subscribe Log Groups for AWS Observability Solution."

Parameters:
SumoLogicResourceRemoveOnDeleteStack:
Expand Down Expand Up @@ -154,7 +154,7 @@ Resources:
Properties:
Location:
ApplicationId: arn:aws:serverlessrepo:us-east-1:956882708938:applications/sumologic-loggroup-connector
SemanticVersion: 1.0.5
SemanticVersion: 1.0.6
Parameters:
DestinationArnType: !Ref AutoSubscribeDestinationARNType
DestinationArnValue: !Ref AutoSubscribeDestinationARN
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AWSTemplateFormatVersion: '2010-09-09'
Transform: 'AWS::Serverless-2016-10-31'
Description: "Version - v2.5.0: Template to Setup Sumo Logic CloudWatch Metric Source. The template setup CW Metrics Sources for Namespaces."
Description: "Version - v2.5.1: Template to Setup Sumo Logic CloudWatch Metric Source. The template setup CW Metrics Sources for Namespaces."

Parameters:
SumoLogicDeployment:
Expand Down
2 changes: 1 addition & 1 deletion aws-observability/apps/common/resources.template.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AWSTemplateFormatVersion: '2010-09-09'
Transform: 'AWS::Serverless-2016-10-31'
Description: "Version - v2.5.0: Template to Setup Sumo Logic Sources and supporting AWS Resources for CloudTrail, ALB, Lambda CloudWatch Logs and CloudWatch Metrics."
Description: "Version - v2.5.1: Template to Setup Sumo Logic Sources and supporting AWS Resources for CloudTrail, ALB, Lambda CloudWatch Logs and CloudWatch Metrics."

Parameters:
SumoLogicDeployment:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AWSTemplateFormatVersion: '2010-09-09'
Transform: AWS::Serverless-2016-10-31
Description: "Version - v2.5.0: The Template should be deployed in Master account. This template setup the Lambda trigger for new account created using AWS Control Tower Account Factory process. The Lambda install the AWS Observability CF template on the regions of new AWS account using stack Sets. (MPCT-ibieokba)"
Description: "Version - v2.5.1: The Template should be deployed in Master account. This template setup the Lambda trigger for new account created using AWS Control Tower Account Factory process. The Lambda install the AWS Observability CF template on the regions of new AWS account using stack Sets. (MPCT-ibieokba)"

Globals:
Function:
Expand Down Expand Up @@ -212,7 +212,7 @@ Resources:
from botocore.exceptions import ClientError
name = 'SUMO-LOGIC-AWS-OBSERVABILITY'
templateURL = "https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.5.0/sumologic_observability.master.template.yaml"
templateURL = "https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.5.1/sumologic_observability.master.template.yaml"
ALL = ["CAPABILITY_IAM", "CAPABILITY_NAMED_IAM", "CAPABILITY_AUTO_EXPAND"]
Expand Down
2 changes: 1 addition & 1 deletion aws-observability/apps/dynamodb/dynamodb_app.template.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AWSTemplateFormatVersion: '2010-09-09'
Transform: 'AWS::Serverless-2016-10-31'
Description: "Version - v2.5.0: Template to setup the DynamoDB app with AWS and Sumo Logic resources for AWS Observability Solution."
Description: "Version - v2.5.1: Template to setup the DynamoDB app with AWS and Sumo Logic resources for AWS Observability Solution."

Metadata:
'AWS::CloudFormation::Interface':
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AWSTemplateFormatVersion: '2010-09-09'
Transform: 'AWS::Serverless-2016-10-31'
Description: "Version - v2.5.0: Template to setup the EC2 Metrics app with AWS and Sumo Logic resources for AWS Observability Solution."
Description: "Version - v2.5.1: Template to setup the EC2 Metrics app with AWS and Sumo Logic resources for AWS Observability Solution."

Metadata:
AWS::CloudFormation::Interface:
Expand Down
2 changes: 1 addition & 1 deletion aws-observability/apps/ecs/ecs_app.template.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AWSTemplateFormatVersion: '2010-09-09'
Transform: 'AWS::Serverless-2016-10-31'
Description: "Version - v2.5.0: Template to setup the ECS app with AWS and Sumo Logic resources for AWS Observability Solution."
Description: "Version - v2.5.1: Template to setup the ECS app with AWS and Sumo Logic resources for AWS Observability Solution."

Metadata:
'AWS::CloudFormation::Interface':
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AWSTemplateFormatVersion: '2010-09-09'
Transform: 'AWS::Serverless-2016-10-31'
Description: "Version - v2.5.0: Template to setup the ElastiCache app with AWS and Sumo Logic resources for AWS Observability Solution."
Description: "Version - v2.5.1: Template to setup the ElastiCache app with AWS and Sumo Logic resources for AWS Observability Solution."

Metadata:
'AWS::CloudFormation::Interface':
Expand Down
2 changes: 1 addition & 1 deletion aws-observability/apps/elb/elb_app.template.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AWSTemplateFormatVersion: '2010-09-09'
Transform: 'AWS::Serverless-2016-10-31'
Description: "Version - v2.5.0: Template to setup the ELB classic app with AWS and Sumo Logic resources for AWS Observability Solution."
Description: "Version - v2.5.1: Template to setup the ELB classic app with AWS and Sumo Logic resources for AWS Observability Solution."

Metadata:
'AWS::CloudFormation::Interface':
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AWSTemplateFormatVersion: '2010-09-09'
Description: "Version - v2.5.0: Lambda Function to add fields to host metrics sources based on the available instances in all regions of the current AWS account."
Description: "Version - v2.5.1: Lambda Function to add fields to host metrics sources based on the available instances in all regions of the current AWS account."

Metadata:
'AWS::CloudFormation::Interface':
Expand Down
4 changes: 2 additions & 2 deletions aws-observability/apps/lambda/lambda_app.template.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AWSTemplateFormatVersion: '2010-09-09'
Transform: 'AWS::Serverless-2016-10-31'
Description: "Version - v2.5.0: Template to setup the Lambda app with AWS and Sumo Logic resources for AWS Observability Solution."
Description: "Version - v2.5.1: Template to setup the Lambda app with AWS and Sumo Logic resources for AWS Observability Solution."

Metadata:
'AWS::CloudFormation::Interface':
Expand Down Expand Up @@ -361,7 +361,7 @@ Resources:
FieldExtractionRuleParseExpression: '| "unknown" as namespace
| if (_sourceHost matches "/aws/lambda/*", "aws/lambda", namespace) as namespace
| if (_sourceHost matches "/aws/rds/*", "aws/rds", namespace) as namespace
| if (_sourceHost matches "/aws/ecs/containerinsights/*", "ecs/containerinsights", namespace) as namespace
| if (_sourceHost matches "/aws/ecs/containerinsights/*", "aws/ecs", namespace) as namespace
| if (_sourceHost matches "/aws/kinesisfirehose/*", "aws/firehose", namespace) as namespace
| fields namespace'
FieldExtractionRuleParseEnabled: true
Expand Down
2 changes: 1 addition & 1 deletion aws-observability/apps/nlb/nlb_app.template.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AWSTemplateFormatVersion: '2010-09-09'
Transform: 'AWS::Serverless-2016-10-31'
Description: "Version - v2.5.0: Template to setup the NLB app with AWS and Sumo Logic resources for AWS Observability Solution."
Description: "Version - v2.5.1: Template to setup the NLB app with AWS and Sumo Logic resources for AWS Observability Solution."

Metadata:
'AWS::CloudFormation::Interface':
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AWSTemplateFormatVersion: '2010-09-09'
Description: "Version - v2.5.0: This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template."
Description: "Version - v2.5.1: This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template."
Transform: 'AWS::Serverless-2016-10-31'

Metadata:
Expand Down Expand Up @@ -660,7 +660,7 @@ Resources:
Properties:
Location:
ApplicationId: arn:aws:serverlessrepo:us-east-1:956882708938:applications/sumologic-loggroup-connector
SemanticVersion: 1.0.5
SemanticVersion: 1.0.6
Parameters:
DestinationArnType: "Lambda"
DestinationArnValue: !GetAtt CloudWatchEventFunction.Outputs.SumoCWLogsLambdaArn
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AWSTemplateFormatVersion: '2010-09-09'
Description: "Version - v2.5.0. Note: Before deploying this template, please select the appropriate region. This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template."
Description: "Version - v2.5.1. Note: Before deploying this template, please select the appropriate region. This CloudFormation template will check for the permission required to deploy the AWS Observability CF template. Based on various error received, please provide the specific permissions to Sumo Logic role or AWS IAM Role used to deploy the template."
Transform: 'AWS::Serverless-2016-10-31'

Metadata:
Expand Down Expand Up @@ -58,7 +58,7 @@ Mappings:
CommonData:
NestedTemplate:
BucketName: "sumologic-appdev-aws-sam-apps"
Version: "v2.5.0"
Version: "v2.5.1"

Resources:

Expand Down
2 changes: 1 addition & 1 deletion aws-observability/apps/rds/rds_app.template.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AWSTemplateFormatVersion: '2010-09-09'
Transform: 'AWS::Serverless-2016-10-31'
Description: "Version - v2.5.0: Template to setup the RDS app with AWS and Sumo Logic resources for AWS Observability Solution."
Description: "Version - v2.5.1: Template to setup the RDS app with AWS and Sumo Logic resources for AWS Observability Solution."

Metadata:
'AWS::CloudFormation::Interface':
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AWSTemplateFormatVersion: '2010-09-09'
Transform: 'AWS::Serverless-2016-10-31'
Description: "Version - v2.5.0: Template to setup the Sumo Logic AWS Inventory Source and Root Cause Explorer app."
Description: "Version - v2.5.1: Template to setup the Sumo Logic AWS Inventory Source and Root Cause Explorer app."

Metadata:
'AWS::CloudFormation::Interface':
Expand Down
2 changes: 1 addition & 1 deletion aws-observability/apps/sns/sns_app.template.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AWSTemplateFormatVersion: '2010-09-09'
Transform: 'AWS::Serverless-2016-10-31'
Description: "Version - v2.5.0: Template to setup the SNS app with AWS and Sumo Logic resources for AWS Observability Solution."
Description: "Version - v2.5.1: Template to setup the SNS app with AWS and Sumo Logic resources for AWS Observability Solution."

Metadata:
'AWS::CloudFormation::Interface':
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ echo '"Section2aAccountAlias='${awsAccountId}'"' >> param.json
echo ']'>>param.json

#download the sumo logic AWS Observability solution's master template
aws s3 cp s3://sumologic-appdev-aws-sam-apps/aws-observability-versions/v2.5.0/sumologic_observability.master.template.yaml sumologic_observability_template.yaml
aws s3 cp s3://sumologic-appdev-aws-sam-apps/aws-observability-versions/v2.5.1/sumologic_observability.master.template.yaml sumologic_observability_template.yaml


#extract stack name into a variable with unique identifier appended
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ $awscmd
$x = $json | ConvertFrom-Json
$awsAccountId = $x.Account
Add-Content $fileName "`"Section2aAccountAlias=${awsAccountId}`"]"
aws s3 cp s3://sumologic-appdev-aws-sam-apps/aws-observability-versions/v2.5.0/sumologic_observability.master.template.yaml sumologic_observability_template.yaml
aws s3 cp s3://sumologic-appdev-aws-sam-apps/aws-observability-versions/v2.5.1/sumologic_observability.master.template.yaml sumologic_observability_template.yaml



Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AWSTemplateFormatVersion: '2010-09-09'
Description: "Version - v2.5.0. Note: Before deploying this template, please select the appropriate region. This CloudFormation template will automate the setup of the AWS Observability Solution. For more information on each parameter, please see the AWS Observability Setup Guide: https://help.sumologic.com/Observability_Solution/AWS_Observability_Solution/01_Deploy_and_Use_AWS_Observability/05_Deploy_AWS_Observability"
Description: "Version - v2.5.1. Note: Before deploying this template, please select the appropriate region. This CloudFormation template will automate the setup of the AWS Observability Solution. For more information on each parameter, please see the AWS Observability Setup Guide: https://help.sumologic.com/Observability_Solution/AWS_Observability_Solution/01_Deploy_and_Use_AWS_Observability/05_Deploy_AWS_Observability"

Metadata:
'AWS::CloudFormation::Interface':
Expand Down Expand Up @@ -461,7 +461,7 @@ Mappings:
CommonData:
NestedTemplate:
BucketName: "sumologic-appdev-aws-sam-apps"
Version: "v2.5.0"
Version: "v2.5.1"
CollectorDetails:
SumoLogicAccountID: 926226587429
CollectorNamePrefix: "aws-observability"
Expand Down

0 comments on commit 62ae16d

Please sign in to comment.