Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge back #435

Merged
merged 6 commits into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG/7.7.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ _Release Date: December 16th, 2024_
* Security: Update go's `crypto` packages to `v0.31.0`.
* Windows: fix error on terminal recovery from client creation commands.
* Update required go version in expiry systems to `v1.23`.
* AGI: Fix patterns to handle connector excessive logging on some errors.
Original file line number Diff line number Diff line change
Expand Up @@ -6554,7 +6554,7 @@
"target": "ConnectorError"
}
],
"title": "metrics-ticker - connections-active: count",
"title": "ERROR metrics-ticker: count",
"type": "timeseries"
}
],
Expand Down
1 change: 1 addition & 0 deletions src/ingest/patterns.yml
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,7 @@ defs:
setName: "ConnectorError"
search: "ERROR metrics-ticker -"
export:
- "ERROR metrics-ticker - (?P<errMessage>.+)@[a-f0-9]+ -> java.lang.ClassCastException: count=(?P<errCount>\\d+)"
- "ERROR metrics-ticker - (?P<errMessage>.+) count=(?P<errCount>\\d+)"
-
setName: "ConnectorReqTotal"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,49 @@
Parser aero_log_parser_type_139
Parser aero_log_parser_type_140
Parser aero_log_parser_type_141
Parser aero_log_parser_type_142
Parser aero_log_parser_type_143
Parser aero_log_parser_type_144
Parser aero_log_parser_type_145
Parser aero_log_parser_type_146
Parser aero_log_parser_type_147
Parser aero_log_parser_type_148
Parser aero_log_parser_type_149
Parser aero_log_parser_type_150
Parser aero_log_parser_type_151
Parser aero_log_parser_type_152
Parser aero_log_parser_type_153
Parser aero_log_parser_type_154
Parser aero_log_parser_type_155
Parser aero_log_parser_type_156
Parser aero_log_parser_type_157
Parser aero_log_parser_type_158
Parser aero_log_parser_type_159
Parser aero_log_parser_type_160
Parser aero_log_parser_type_161
Parser aero_log_parser_type_162
Parser aero_log_parser_type_163
Parser aero_log_parser_type_164
Parser aero_log_parser_type_165
Parser aero_log_parser_type_166
Parser aero_log_parser_type_167
Parser aero_log_parser_type_168
Parser aero_log_parser_type_169
Parser aero_log_parser_type_170
Parser aero_log_parser_type_171
Parser aero_log_parser_type_172
Parser aero_log_parser_type_173
Parser aero_log_parser_type_174
Parser aero_log_parser_type_175
Parser aero_log_parser_type_176
Parser aero_log_parser_type_177
Parser aero_log_parser_type_178
Parser aero_log_parser_type_179
Parser aero_log_parser_type_180
Parser aero_log_parser_type_181
Parser aero_log_parser_type_182
Parser aero_log_parser_type_183
Parser aero_log_parser_type_184
Reserve_data true
Preserve_Key On

Expand Down
583 changes: 442 additions & 141 deletions src/ingest/thirdparty_tools/fluentbit/aerospike-fluent-bit-parsers.conf

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions src/ingest/thirdparty_tools/log_parse_regex_transformer.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,16 +218,17 @@ def parse_patterns_yaml():
with open(G_GIAI_DOWNLOADED_PATTERNS_FILENAME, "r") as fh:
data = yaml.safe_load(fh)
defs= data.get("defs")
unique_regex_str = ""
ignored_line_str = ""
for each_def in defs:
patterns = each_def.get("patterns")
unique_regex_str = ""
ignored_line_str = ""
for item in patterns:
for rex in item["export"]:
output, is_valid=parse_export_regex(rex)
if is_valid:
unique_regex_str = unique_regex_str + output +"\n"
else:
# print(" invalid reg ", output)
ignored_line_str = ignored_line_str + output +"\n"

# save to modified patterns to file
Expand Down Expand Up @@ -318,5 +319,3 @@ def parse_export_regex(p_regex):
if is_splunk_conf==True:
generate_splunk_conf_files()



Original file line number Diff line number Diff line change
Expand Up @@ -140,3 +140,46 @@ REPORT-aero_log_parser_type_138 = aero_log_parser_type_138
REPORT-aero_log_parser_type_139 = aero_log_parser_type_139
REPORT-aero_log_parser_type_140 = aero_log_parser_type_140
REPORT-aero_log_parser_type_141 = aero_log_parser_type_141
REPORT-aero_log_parser_type_142 = aero_log_parser_type_142
REPORT-aero_log_parser_type_143 = aero_log_parser_type_143
REPORT-aero_log_parser_type_144 = aero_log_parser_type_144
REPORT-aero_log_parser_type_145 = aero_log_parser_type_145
REPORT-aero_log_parser_type_146 = aero_log_parser_type_146
REPORT-aero_log_parser_type_147 = aero_log_parser_type_147
REPORT-aero_log_parser_type_148 = aero_log_parser_type_148
REPORT-aero_log_parser_type_149 = aero_log_parser_type_149
REPORT-aero_log_parser_type_150 = aero_log_parser_type_150
REPORT-aero_log_parser_type_151 = aero_log_parser_type_151
REPORT-aero_log_parser_type_152 = aero_log_parser_type_152
REPORT-aero_log_parser_type_153 = aero_log_parser_type_153
REPORT-aero_log_parser_type_154 = aero_log_parser_type_154
REPORT-aero_log_parser_type_155 = aero_log_parser_type_155
REPORT-aero_log_parser_type_156 = aero_log_parser_type_156
REPORT-aero_log_parser_type_157 = aero_log_parser_type_157
REPORT-aero_log_parser_type_158 = aero_log_parser_type_158
REPORT-aero_log_parser_type_159 = aero_log_parser_type_159
REPORT-aero_log_parser_type_160 = aero_log_parser_type_160
REPORT-aero_log_parser_type_161 = aero_log_parser_type_161
REPORT-aero_log_parser_type_162 = aero_log_parser_type_162
REPORT-aero_log_parser_type_163 = aero_log_parser_type_163
REPORT-aero_log_parser_type_164 = aero_log_parser_type_164
REPORT-aero_log_parser_type_165 = aero_log_parser_type_165
REPORT-aero_log_parser_type_166 = aero_log_parser_type_166
REPORT-aero_log_parser_type_167 = aero_log_parser_type_167
REPORT-aero_log_parser_type_168 = aero_log_parser_type_168
REPORT-aero_log_parser_type_169 = aero_log_parser_type_169
REPORT-aero_log_parser_type_170 = aero_log_parser_type_170
REPORT-aero_log_parser_type_171 = aero_log_parser_type_171
REPORT-aero_log_parser_type_172 = aero_log_parser_type_172
REPORT-aero_log_parser_type_173 = aero_log_parser_type_173
REPORT-aero_log_parser_type_174 = aero_log_parser_type_174
REPORT-aero_log_parser_type_175 = aero_log_parser_type_175
REPORT-aero_log_parser_type_176 = aero_log_parser_type_176
REPORT-aero_log_parser_type_177 = aero_log_parser_type_177
REPORT-aero_log_parser_type_178 = aero_log_parser_type_178
REPORT-aero_log_parser_type_179 = aero_log_parser_type_179
REPORT-aero_log_parser_type_180 = aero_log_parser_type_180
REPORT-aero_log_parser_type_181 = aero_log_parser_type_181
REPORT-aero_log_parser_type_182 = aero_log_parser_type_182
REPORT-aero_log_parser_type_183 = aero_log_parser_type_183
REPORT-aero_log_parser_type_184 = aero_log_parser_type_184
Loading
Loading