cloudwatch_logs_insights_url_builder 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3d56725a23f6ab73a39e5506520875674cb18cbc65fa06899fb4912ded43924
-  data.tar.gz: ccc7edc00aab56148028d9054cda2d57692ab0fef323d12c3e4d10cffa12594d
+  metadata.gz: 34d2f31f3aa8e5546cd5f16090a7614c290070dad11699a3fa0869a2302d2dc9
+  data.tar.gz: 5c00488c30674c89a5693bd8eeda4ee634ed9ee9197ead8504a30f268dc36a0f
 SHA512:
-  metadata.gz: d686059bbef57f8ca87cb2df54d2cc7e3d13f915b4efb985d32c4b643e99d09729a2bf17b94e41ea08c833af9eee72c8ceac8bb3dc5220fe1a99beb05ddb1360
-  data.tar.gz: eae567ce0e58e2c7f46327100a13674ce3e6280192f9d34b13f27a257c88e7d95490005ec44e6facceebe0e6686853a1d6c9bc98ec57be965e837485e922e584
+  metadata.gz: a1abedef52813b617fffb9689d40d919b1fc37447406fdbee838a55e535199e5962658b0b391dba505be66bbfe86358350fff73071bd0ed5a5fed2b23dc3fc80
+  data.tar.gz: 2570eebd4aa8aa5e3005aba36eb840cb0978b1d9a2c7a567a852b48e2aa0a8b31b9d0637cecc51f2284135b52f9e3f61ce8685e73456b8928a6b53625dd4330b

data/.github/workflows/rspec.yml

@@ -15,6 +15,7 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
+          ruby-version: '2.7'
 
       - name: Bundler and gem install
         run: |

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudwatch_logs_insights_url_builder (0.0.4)
+    cloudwatch_logs_insights_url_builder (0.0.6)
       url
 
 GEM

data/README.md

@@ -1,13 +1,13 @@
 # cloudwatch_logs_url_builder
 
-![rspec](https://github.com/naomichi-y/cloudwatch_logs_url_builder/actions/workflows/rspec.yml/badge.svg)
+![rspec](https://github.com/naomichi-y/cloudwatch_logs_insights_url_builder/actions/workflows/rspec.yml/badge.svg)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
 Generate AWS Console URL for Amazon CloudWatch Insights.
 
 ## Installation
 
-```
+```ruby
 gem 'cloudwatch_logs_insights_url_builder'
 ```
 
@@ -18,12 +18,13 @@ require 'cloudwatch_logs_insights_url_builder'
 
 builder = CloudWatchLogsInsightsUrlBuilder.new
 builder.time_type = 'ABSOLUTE'
-builder.start_time = 24 * 3600
+builder.start_time = - (24 * 3600)
 builder.end_time = 0
-
-query = 'fields @timestamp, @message, @logStream, @log\n| sort @timestamp desc\n| limit 2'
-log_groups = ['/aws/cloudtrail']
+builder.log_groups = ['/aws/cloudtrail']
 
 # https://us-east-1.console.aws.amazon.com/cloudwatch/home?...
-builder.log_insights_url(query, log_groups)
+builder.log_insights_url("fields @timestamp, @message, @logStream, @log\n| sort @timestamp desc\n| limit 2")
 ```
+The generated URL can be used to open the CloudWatch Insights page from a browser.
+
+<img width="80%" alt="Screen Shot 2023-01-28 at 12 45 11" src="https://user-images.githubusercontent.com/1632478/215240546-417c523e-692f-47eb-8d01-ccca215d348b.png">

data/cloudwatch_logs_ingihts_url_builder.gemspec

@@ -1,11 +1,14 @@
 Gem::Specification.new do |spec|
   spec.name          = 'cloudwatch_logs_insights_url_builder'
-  spec.version       = '0.0.5'
+  spec.version       = '0.0.7'
   spec.authors       = ['naomichi-y']
   spec.email         = ['n.yamakita@gmail.com']
 
   spec.summary       = 'Generate AWS Console URL for Amazon CloudWatch Insights.'
-  spec.description   = 'Specify log groups and filters to generate URLs accessible to the AWS Console.'
+
+  spec.description   = +'Specify log groups and filters to generate CloudWatch Logs Insights URL '
+  spec.description  << 'accessible to AWS Console.'
+
   spec.homepage      = 'https://github.com/naomichi-y/cloudwatch_logs_insights_url_builder'
   spec.required_ruby_version = Gem::Requirement.new('>= 2.6.0')
 

data/lib/cloudwatch_logs_insights_url_builder/criteria.rb

@@ -7,28 +7,28 @@ class CloudWatchLogsInsightsUrlBuilder
     def add(key, value)
       case value
       when Array
-        result = +encode_key("~#{key}~(")
+        result = +encode("~#{key}~(")
 
         value.each do |v|
-          result << "#{encode_key("~'")}#{encode_value(v)}"
+          result << "#{encode("~'")}#{encode_value(v)}"
         end
 
-        @conditions << result + encode_key(')')
+        @conditions << result + encode(')')
 
       when String
-        @conditions << "#{encode_key("~#{key}~'")}#{encode_value(value)}"
+        @conditions << "#{encode("~#{key}~'")}#{encode_value(value)}"
       else
-        @conditions << "#{encode_key("~#{key}~")}#{encode_value(value)}"
+        @conditions << "#{encode("~#{key}~")}#{encode_value(value)}"
       end
     end
 
     def build
-      "#{encode_key('~(')}#{@conditions.join.delete_prefix(encode_key('~'))}#{encode_key(')')}"
+      "#{encode('~(')}#{@conditions.join.delete_prefix(encode('~'))}#{encode(')')}"
     end
 
     private
 
-    def encode_key(key)
+    def encode(key)
       URI.encode_www_form_component(URI.encode_www_form_component(key)).gsub('%', '$')
     end
 

data/lib/cloudwatch_logs_insights_url_builder.rb

@@ -2,20 +2,21 @@ require 'url'
 require 'cloudwatch_logs_insights_url_builder/criteria'
 
 class CloudWatchLogsInsightsUrlBuilder
-  attr_accessor :time_type, :timezone, :start_time, :end_time
+  attr_accessor :time_type, :timezone, :start_time, :end_time, :log_groups
 
   STRING_TIME_FORMAT = '%Y-%m-%dT%T.000Z'.freeze
 
-  def initialize(region)
+  def initialize(region = 'us-east-1')
     @region = region
     @time_type = 'RELATIVE'
     @timezone = 'Local'
     @unit = 'minutes'
     @start_time = -86_400
     @end_time = 0
+    @log_groups = []
   end
 
-  def log_insights_url(query, log_groups = [])
+  def log_insights_url(query)
     url = +"https://#{@region}.console.aws.amazon.com/cloudwatch/home?region=#{@region}#logsV2:logs-insights"
     url << URI.encode_www_form_component('?queryDetail=').gsub('%', '$')
 
@@ -30,7 +31,7 @@ class CloudWatchLogsInsightsUrlBuilder
     builder.add('tz', @timezone)
     builder.add('editorString', query)
     builder.add('isLiveTail', false)
-    builder.add('source', log_groups) if log_groups.size.positive?
+    builder.add('source', @log_groups) if @log_groups.size.positive?
 
     url << builder.build
     url

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudwatch_logs_insights_url_builder
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - naomichi-y
@@ -80,8 +80,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Specify log groups and filters to generate URLs accessible to the AWS
-  Console.
+description: Specify log groups and filters to generate CloudWatch Logs Insights URL
+  accessible to AWS Console.
 email:
 - n.yamakita@gmail.com
 executables: []