feat: Update Elasticsearch json parser to use LoggingReceiverMacro
#1987
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -320,9 +320,9 @@ func (p LoggingProcessorParseRegexComplex) Components(ctx context.Context, tag, | |||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| type MultilineRule struct { | ||||||||||||||
| StateName string `yaml:"state_name,omitempty"` | ||||||||||||||
| Regex string `yaml:"regex,omitempty"` | ||||||||||||||
| NextState string `yaml:"next_state,omitempty"` | ||||||||||||||
|
||||||||||||||
| StateName string `yaml:"state_name,omitempty"` | |
| Regex string `yaml:"regex,omitempty"` | |
| NextState string `yaml:"next_state,omitempty"` | |
| StateName string | |
| Regex string | |
| NextState string |
Footnotes
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| - type: elasticsearch_json |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| {"type": "server", "timestamp": "2024-06-10T12:34:56,789Z", "level": "INFO", "component": "o.e.n.Node", "cluster.name": "elasticsearch", "node.name": "node-1", "message": "starting ..."} | ||
| {"type": "server", "timestamp": "2024-06-10T12:35:00,321Z", "level": "WARN", "component": "o.e.d.z.ZenDiscovery", "node.name": "node-1", "message": "failed to connect to master", "user.run_by.name": "admin", "event.action": "connect"} | ||
| {"type": "server", "timestamp": "2024-06-10T12:35:10,123Z", "level": "ERROR", "component": "o.e.b.Bootstrap", "node.name": "node-1", "message": "Exception", "error.type": "java.lang.IllegalStateException", "error.message": "failed to obtain node locks"} | ||
| {"type": "server", "timestamp": "2024-06-10T12:35:15,456Z", "level": "DEBUG", "component": "o.e.n.Node", "node.name": "node-1", "message": "stopping ..."} | ||
| {"type": "server", "timestamp": "2024-06-10T12:35:16,789Z", "level": "TRACE", "component": "o.e.n.Node", "node.name": "node-1", "message": "stopped"} | ||
| {"type": "server", "timestamp": "2024-06-10T12:35:17,123Z", "level": "DEPRECATION", "component": "o.e.n.Node", "node.name": "node-1", "message": "deprecated setting used"} | ||
| {"type": "server", "timestamp": "2024-06-10T12:35:18,456Z", "level": "CRITICAL", "component": "o.e.n.Node", "node.name": "node-1", "message": "critical error occurred"} | ||
| {"type": "server", "timestamp": "2024-06-10T12:35:19,456Z", "level": "FATAL", "component": "o.e.n.Node", "node.name": "node-1", "message": "fatal error occurred"} | ||
| {"type": "server", "timestamp": "2024-06-10T12:35:20,456Z", "level": "UNKNOWN", "component": "o.e.n.Node", "node.name": "node-1", "message": "unknown log level"} | ||
| {"type": "server", "timestamp": "2024-06-10T12:35:21,456Z", "level": "INFO", "message": "missing component and node name"} | ||
| {"type": "server", "timestamp": "2024-06-10T12:35:22,456Z", "level": "INFO", "component": "o.e.n.Node", "cluster.name": "elasticsearch", "message": "missing node name"} | ||
| {"type": "server", "timestamp": "2024-06-10T12:35:23,456Z", "level": "INFO", "component": "o.e.n.Node", "node.name": "node-1", "message": "missing cluster name"} | ||
| {"type": "server", "timestamp": "2024-06-10T12:35:24,456Z", "level": "INFO", "component": "o.e.n.Node", "node.name": "node-1", "message": "nested fields", "user.run_by.name": "testuser", "authentication.token.id": "abc123"} | ||
| {"type": "server", "timestamp": "2024-06-10T12:35:25,456Z", "level": "ERROR", "component": "o.e.b.ElasticsearchUncaughtExceptionHandler", "node.name": "node-1", "message": "uncaught exception in thread [main]", "stacktrace": ["org.elasticsearch.bootstrap.StartupException: java.lang.IllegalArgumentException: unknown setting [invalid.key]", "at org.elasticsearch.bootstrap.Elasticsearch.init(Elasticsearch.java:166)", "... 6 more"]} | ||
| {"type": "server", "timestamp": "2024-06-10T12:35:26,456Z", "level": "INFO", "component": "o.e.n.Node", "node.name": "node-1", "message": "invalid timestamp", "timestamp": "not-a-timestamp"} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,201 @@ | ||
| - entries: | ||
|
||
| - jsonPayload: | ||
| cluster: | ||
| name: elasticsearch | ||
| component: o.e.n.Node | ||
| level: INFO | ||
| message: starting ... | ||
| node: | ||
| name: node-1 | ||
| type: server | ||
| labels: | ||
| logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_json | ||
| logName: projects/my-project/logs/transformation_test | ||
| severity: 200.0 | ||
| timestamp: 2024-06-10T12:34:56.789000000Z | ||
| - jsonPayload: | ||
| component: o.e.d.z.ZenDiscovery | ||
| event: | ||
| action: connect | ||
| level: WARN | ||
| message: failed to connect to master | ||
| node: | ||
| name: node-1 | ||
| type: server | ||
| user: | ||
| run_by: | ||
| name: admin | ||
| labels: | ||
| logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_json | ||
| logName: projects/my-project/logs/transformation_test | ||
| severity: 400.0 | ||
| timestamp: 2024-06-10T12:35:00.321000000Z | ||
| - jsonPayload: | ||
| component: o.e.b.Bootstrap | ||
| error.message: failed to obtain node locks | ||
| error.type: java.lang.IllegalStateException | ||
| level: ERROR | ||
| message: Exception | ||
| node: | ||
| name: node-1 | ||
| type: server | ||
| labels: | ||
| logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_json | ||
| logName: projects/my-project/logs/transformation_test | ||
| severity: 500.0 | ||
| timestamp: 2024-06-10T12:35:10.123000000Z | ||
| - jsonPayload: | ||
| component: o.e.n.Node | ||
| level: DEBUG | ||
| message: stopping ... | ||
| node: | ||
| name: node-1 | ||
| type: server | ||
| labels: | ||
| logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_json | ||
| logName: projects/my-project/logs/transformation_test | ||
| severity: 100.0 | ||
| timestamp: 2024-06-10T12:35:15.456000000Z | ||
| - jsonPayload: | ||
| component: o.e.n.Node | ||
| level: TRACE | ||
| message: stopped | ||
| node: | ||
| name: node-1 | ||
| type: server | ||
| labels: | ||
| logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_json | ||
| logName: projects/my-project/logs/transformation_test | ||
| severity: 100.0 | ||
| timestamp: 2024-06-10T12:35:16.789000000Z | ||
| - jsonPayload: | ||
| component: o.e.n.Node | ||
| level: DEPRECATION | ||
| message: deprecated setting used | ||
| node: | ||
| name: node-1 | ||
| type: server | ||
| labels: | ||
| logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_json | ||
| logName: projects/my-project/logs/transformation_test | ||
| severity: 400.0 | ||
| timestamp: 2024-06-10T12:35:17.123000000Z | ||
| - jsonPayload: | ||
| component: o.e.n.Node | ||
| level: CRITICAL | ||
| message: critical error occurred | ||
| node: | ||
| name: node-1 | ||
| type: server | ||
| labels: | ||
| logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_json | ||
| logName: projects/my-project/logs/transformation_test | ||
| severity: 500.0 | ||
| timestamp: 2024-06-10T12:35:18.456000000Z | ||
| - jsonPayload: | ||
| component: o.e.n.Node | ||
| level: FATAL | ||
| message: fatal error occurred | ||
| node: | ||
| name: node-1 | ||
| type: server | ||
| labels: | ||
| logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_json | ||
| logName: projects/my-project/logs/transformation_test | ||
| severity: 600.0 | ||
| timestamp: 2024-06-10T12:35:19.456000000Z | ||
| - jsonPayload: | ||
| component: o.e.n.Node | ||
| level: UNKNOWN | ||
| message: unknown log level | ||
| node: | ||
| name: node-1 | ||
| type: server | ||
| labels: | ||
| logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_json | ||
| logName: projects/my-project/logs/transformation_test | ||
| timestamp: 2024-06-10T12:35:20.456000000Z | ||
| - jsonPayload: | ||
| level: INFO | ||
| message: missing component and node name | ||
| type: server | ||
| labels: | ||
| logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_json | ||
| logName: projects/my-project/logs/transformation_test | ||
| severity: 200.0 | ||
| timestamp: 2024-06-10T12:35:21.456000000Z | ||
| - jsonPayload: | ||
| cluster: | ||
| name: elasticsearch | ||
| component: o.e.n.Node | ||
| level: INFO | ||
| message: missing node name | ||
| type: server | ||
| labels: | ||
| logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_json | ||
| logName: projects/my-project/logs/transformation_test | ||
| severity: 200.0 | ||
| timestamp: 2024-06-10T12:35:22.456000000Z | ||
| - jsonPayload: | ||
| component: o.e.n.Node | ||
| level: INFO | ||
| message: missing cluster name | ||
| node: | ||
| name: node-1 | ||
| type: server | ||
| labels: | ||
| logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_json | ||
| logName: projects/my-project/logs/transformation_test | ||
| severity: 200.0 | ||
| timestamp: 2024-06-10T12:35:23.456000000Z | ||
| - jsonPayload: | ||
| authentication: | ||
| token: | ||
| id: abc123 | ||
| component: o.e.n.Node | ||
| level: INFO | ||
| message: nested fields | ||
| node: | ||
| name: node-1 | ||
| type: server | ||
| user: | ||
| run_by: | ||
| name: testuser | ||
| labels: | ||
| logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_json | ||
| logName: projects/my-project/logs/transformation_test | ||
| severity: 200.0 | ||
| timestamp: 2024-06-10T12:35:24.456000000Z | ||
| - jsonPayload: | ||
| component: o.e.b.ElasticsearchUncaughtExceptionHandler | ||
| level: ERROR | ||
| message: uncaught exception in thread [main] | ||
| node: | ||
| name: node-1 | ||
| stacktrace: | ||
| - "org.elasticsearch.bootstrap.StartupException: java.lang.IllegalArgumentException: unknown setting [invalid.key]" | ||
| - at org.elasticsearch.bootstrap.Elasticsearch.init(Elasticsearch.java:166) | ||
| - ... 6 more | ||
| type: server | ||
| labels: | ||
| logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_json | ||
| logName: projects/my-project/logs/transformation_test | ||
| severity: 500.0 | ||
| timestamp: 2024-06-10T12:35:25.456000000Z | ||
| - jsonPayload: | ||
| component: o.e.n.Node | ||
| level: INFO | ||
| message: invalid timestamp | ||
| node: | ||
| name: node-1 | ||
| timestamp: not-a-timestamp | ||
| type: server | ||
| labels: | ||
| logging.googleapis.com/instrumentation_source: agent.googleapis.com/elasticsearch_json | ||
| logName: projects/my-project/logs/transformation_test | ||
| severity: 200.0 | ||
| timestamp: 2024-06-10T12:35:26.456000000Z | ||
| partialSuccess: true | ||
| resource: | ||
| labels: {} | ||
| type: gce_instance | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| - config_error: "failed generating OTel processor: &confgenerator.loggingProcessorMacroAdapter[github.com/GoogleCloudPlatform/ops-agent/apps.LoggingProcessorMacroElasticsearchJson]{ConfigComponent:confgenerator.ConfigComponent{Type:\"elasticsearch_json\"}, ProcessorMacro:apps.LoggingProcessorMacroElasticsearchJson{}}, err: unimplemented" |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change should prevent the YAML un-marshalling to validate recursively all fields in
ReceiverMixin, thus not causing thepanicwith missing yaml tags.Suggested change :