Rename input_type to type in config and input_type to prospector.type in event #4294
Conversation
This file contains 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
ruflin
added
Filebeat
ruflin
force-pushed
the
input_type-to-type
branch
from
ea3087f to
c8f4ebe
Compare
|
jenkins, retest it |
filebeat/config/config.go
Outdated
| @@ -40,14 +40,14 @@ var ( | |||
| ) | |||
|
|
|||
| const ( | |||
| LogInputType = "log" | |||
| StdinInputType = "stdin" | |||
| LogType = "log" | |||
There was a problem hiding this comment.
[golint] reported by reviewdog 🐶
exported const LogType should have comment (or a comment on this block) or be unexported
ruflin
force-pushed
the
input_type-to-type
branch
from
fb0a4fc to
5081178
Compare
… in event Document type was removed recently because _type does not exist anymore in Elasticsearch. As input_type is actually the type of the prospector it makes more sense to have it as type config options instead of type. Renaming it in the config means it should also be renamed in the event. In the event the field was renamed to `prospector.type`. This change is on the config side backward compatible as input_type was only deprecated. On the event side the old field does not exist anymore. * Cleanup expected test json files. Indentation was standardised and `input_type` replaced by `prospector.type`. * Update changelog * Add system tests for deprecated message
ruflin
force-pushed
the
input_type-to-type
branch
from
5081178 to
ac35a91
Compare
ruflin
changed the title
tsg
reviewed
May 15, 2017
| @@ -84,8 +85,13 @@ type config struct { | |||
|
|
|||
| func (c *config) Validate() error { | |||
|
|
|||
| // DEPRECATED 6.0.0: warning is already outputted on propsector level | |||
| if c.InputType != "" { | |||
| c.Type = c.InputType | |||
There was a problem hiding this comment.
👍 for backwards compatibility.
tsg
reviewed
May 15, 2017
| "program" : "GoogleSoftwareUpdateAgent", | ||
| "message" : "2016-12-13 11:35:28.420 GoogleSoftwareUpdateAgent[21412/0x700007399000] [lvl=2] -[KSAgentApp updateProductWithProductID:usingEngine:] Checking for updates for \"All Products\" using engine <KSUpdateEngine:0x100341a00\n\t\tticketStore=<KSPersistentTicketStore:0x100204520 store=<KSKeyedPersistentStore:0x100213290\n\t\t\tpath=\"/Users/tsg/Library/Google/GoogleSoftwareUpdate/TicketStore/Keystone.ticketstore\"\n\t\t\tlockFile=<KSLockFile:0x1002160e0\n\t\t\t\tpath=\"/Users/tsg/Library/Google/GoogleSoftwareUpdate/TicketStore/Keystone.ticketstore.lock\"\n\t\t\t\tlocked=NO\n\t\t\t>\n\t\t>>\n\t\tprocessor=<KSActionProcessor:0x1003bb5f0\n\t\t\tdelegate=<KSUpdateEngine:0x100341a00>\n\t\t\tisProcessing=NO actionsCompleted=0 progress=0.00\n\t\t\terrors=0 currentActionErrors=0\n\t\t\tevents=0 currentActionEvents=0\n\t\t\tactionQueue=( )\n\t\t>\n\t\tdelegate=(null)\n\t\tserverInfoStore=(null)\n\t\terrors=0\n\t>", | ||
| "timestamp" : "Dec 13 11:35:28" | ||
| { |
There was a problem hiding this comment.
Did you have to update these files in order for the tests to pass? From what I remember we're only comparing the fields under the module. Not that it's bad to have them updated :)
Also, how come the diffs are so big, whitespace?
There was a problem hiding this comment.
I actually didn't have to update them. It just passed without changes with the old type inside. But it bugged me to have "outdated" docs in the tests so I updated them manually. Then my editor automatically did the formatting. Changes are only in whitespaces and input_type to prospector.type. I can also revert it to master if you prefer.
|
@ruflin Appveyor might have caught something. |
14 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Document type was removed recently because _type does not exist anymore in Elasticsearch. As input_type is actually the type of the prospector it makes more sense to have it as type config options instead of type. Renaming it in the config means it should also be renamed in the event. In the event the field was renamed to
prospector.type.This change is on the config side backward compatible as input_type was only deprecated. On the event side the old field does not exist anymore.
input_typereplaced byprospector.type.