in_cloudwatch_logs.rb in fluent-plugin-cloudwatch-logs-0.13.1

- old
+ new

@@ -183,19 +183,19 @@
           end
           log_group_names.each do |log_group_name|
             if @use_log_stream_name_prefix || @use_todays_log_stream
               log_stream_name_prefix = @use_todays_log_stream ? get_todays_date : @log_stream_name
               begin
-                log_streams = describe_log_streams(log_stream_name_prefix)
+                log_streams = describe_log_streams(log_stream_name_prefix, nil, nil, log_group_name)
                 log_streams.concat(describe_log_streams(get_yesterdays_date)) if @use_todays_log_stream
                 log_streams.each do |log_stream|
                   log_stream_name = log_stream.log_stream_name
                   events = get_events(log_group_name, log_stream_name)
                   metadata = if @include_metadata
                                {
                                  "log_stream_name" => log_stream_name,
-                                 "log_group_name" => @log_group_name
+                                 "log_group_name" => log_group_name
                                }
                              else
                                {}
                              end
                   events.each do |event|
@@ -279,13 +279,13 @@
 
         response.events
       end
     end
 
-    def describe_log_streams(log_stream_name_prefix, log_streams = nil, next_token = nil)
+    def describe_log_streams(log_stream_name_prefix, log_streams = nil, next_token = nil, log_group_name=nil)
       throttling_handler('describe_log_streams') do
         request = {
-          log_group_name: @log_group_name
+          log_group_name: log_group_name != nil ? log_group_name : @log_group_name
         }
         request[:next_token] = next_token if next_token
         request[:log_stream_name_prefix] = log_stream_name_prefix if log_stream_name_prefix
         response = @logs.describe_log_streams(request)
         if log_streams