fluent-plugin-cloudwatch-ingest 0.1.17 → 0.1.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c436b9cc8f2c2131bcf7fd1b2cd602838dffb6e5
|
|
4
|
+
data.tar.gz: 2a63f297aa1838e20834f2cec7e555c980cc4a71
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c36b1da93fa2da7f6b145de65b218c4e0b91849b7f3bfbab79558ac6c2c4ad2e3b6914b338cfc45a5a6aaeb5d21f564925e66cab485d906f6356e85d6d1af379
|
|
7
|
+
data.tar.gz: d7b9cc3f47490b6b6350f29821db686af67ce4b6b4245e69f207526f692180e7436913bc4e32170b936a9efdc4ced100ac304b7262bbc647c7d2f01f9b716607
|
|
@@ -71,7 +71,7 @@ module Fluent::Plugin
|
|
|
71
71
|
private
|
|
72
72
|
|
|
73
73
|
def emit(log_event)
|
|
74
|
-
log.
|
|
74
|
+
log.warn(log_event)
|
|
75
75
|
end
|
|
76
76
|
|
|
77
77
|
def log_groups(log_group_prefix)
|
|
@@ -81,10 +81,16 @@ module Fluent::Plugin
|
|
|
81
81
|
next_token = nil
|
|
82
82
|
loop do
|
|
83
83
|
begin
|
|
84
|
-
response =
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
84
|
+
response = if !log_group_prefix.empty?
|
|
85
|
+
@aws.describe_log_groups(
|
|
86
|
+
log_group_name_prefix: log_group_prefix,
|
|
87
|
+
next_token: next_token
|
|
88
|
+
)
|
|
89
|
+
else
|
|
90
|
+
@aws.describe_log_groups(
|
|
91
|
+
next_token: next_token
|
|
92
|
+
)
|
|
93
|
+
end
|
|
88
94
|
|
|
89
95
|
response.log_groups.each { |g| log_groups << g.log_group_name }
|
|
90
96
|
break unless response.next_token
|
|
@@ -106,11 +112,18 @@ module Fluent::Plugin
|
|
|
106
112
|
next_token = nil
|
|
107
113
|
loop do
|
|
108
114
|
begin
|
|
109
|
-
response =
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
115
|
+
response = if !log_stream_name_prefix.empty?
|
|
116
|
+
@aws.describe_log_streams(
|
|
117
|
+
log_group_name: group,
|
|
118
|
+
log_stream_name_prefix: log_stream_name_prefix,
|
|
119
|
+
next_token: next_token
|
|
120
|
+
)
|
|
121
|
+
else
|
|
122
|
+
@aws.describe_log_streams(
|
|
123
|
+
log_group_name: group,
|
|
124
|
+
next_token: next_token
|
|
125
|
+
)
|
|
126
|
+
end
|
|
114
127
|
|
|
115
128
|
response.log_streams.each { |s| log_streams << s.log_stream_name }
|
|
116
129
|
break unless reponse.next_token
|
|
@@ -196,7 +209,7 @@ module Fluent::Plugin
|
|
|
196
209
|
@log = log
|
|
197
210
|
@store = {}
|
|
198
211
|
|
|
199
|
-
if File.exist?(
|
|
212
|
+
if File.exist?(filepath)
|
|
200
213
|
self.statefile = Pathname.new(@filepath).open('r+')
|
|
201
214
|
else
|
|
202
215
|
@log.warn("No state file #{statefile} Creating a new one.")
|
|
@@ -214,7 +227,7 @@ module Fluent::Plugin
|
|
|
214
227
|
lockstatus = statefile.flock(File::LOCK_EX | File::LOCK_NB)
|
|
215
228
|
raise CloudwatchIngestInput::State::LockFailed if lockstatus == false
|
|
216
229
|
|
|
217
|
-
@store.merge!(Psych.safe_load(statefile.read
|
|
230
|
+
@store.merge!(Psych.safe_load(statefile.read))
|
|
218
231
|
@log.info("Loaded #{@store.keys.size} log groups from #{statefile}")
|
|
219
232
|
end
|
|
220
233
|
|