Skip to content

Commit

Permalink
Change yaml extension to yml for Winlogbeat registry file. This is fo…
Browse files Browse the repository at this point in the history
…r consistency with all other YAML files used in Beats.
  • Loading branch information
andrewkroh committed Jan 5, 2016
1 parent 0947493 commit 43233eb
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion winlogbeat/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ install-cfg:
cp etc/$(BEATNAME).template.json $(PREFIX)/$(BEATNAME).template.json
# Windows
cp etc/${BEATNAME}.yml $(PREFIX)/${BEATNAME}-win.yml
sed -i 's|#\{0,1\}\(registry_file:\).*|\1 C:/ProgramData/winlogbeat/.winlogbeat.yaml|' $(PREFIX)/$(BEATNAME)-win.yml
sed -i 's|#\{0,1\}\(registry_file:\).*|\1 C:/ProgramData/winlogbeat/.winlogbeat.yml|' $(PREFIX)/$(BEATNAME)-win.yml
sed -i 's|#\{0,1\}\(to_files:\).*|\1 true|' $(PREFIX)/$(BEATNAME)-win.yml
sed -i 's|#\{0,1\}\(level:\).*|\1 info|' $(PREFIX)/$(BEATNAME)-win.yml
sed -i '/log files/{n;s|#\{0,1\}path:.*|path: C:/ProgramData/winlogbeat/Logs|}' $(PREFIX)/$(BEATNAME)-win.yml
8 changes: 4 additions & 4 deletions winlogbeat/checkpoint/checkpoint_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func TestWriteMaxUpdates(t *testing.T) {
}
}()

file := filepath.Join(dir, "some", "new", "dir", ".winlogbeat.yaml")
file := filepath.Join(dir, "some", "new", "dir", ".winlogbeat.yml")
assert.False(t, fileExists(file), "%s should not exist", file)
cp, err := NewCheckpoint(file, 2, time.Hour)
if err != nil {
Expand Down Expand Up @@ -65,7 +65,7 @@ func TestWriteTimedFlush(t *testing.T) {
}
}()

file := filepath.Join(dir, ".winlogbeat.yaml")
file := filepath.Join(dir, ".winlogbeat.yml")
assert.False(t, fileExists(file), "%s should not exist", file)
cp, err := NewCheckpoint(file, 100, time.Second)
if err != nil {
Expand Down Expand Up @@ -98,7 +98,7 @@ func TestCreateDir(t *testing.T) {
}()

stateDir := filepath.Join(dir, "state", "dir", "does", "not", "exists")
file := filepath.Join(stateDir, ".winlogbeat.yaml")
file := filepath.Join(stateDir, ".winlogbeat.yml")
cp := &Checkpoint{file: file}

assert.False(t, fileExists(stateDir), "%s should not exist", file)
Expand Down Expand Up @@ -129,7 +129,7 @@ func TestCreateDirAlreadyExists(t *testing.T) {
}
}()

file := filepath.Join(dir, ".winlogbeat.yaml")
file := filepath.Join(dir, ".winlogbeat.yml")
cp := &Checkpoint{file: file}

assert.True(t, fileExists(dir), "%s should exist", file)
Expand Down
10 changes: 5 additions & 5 deletions winlogbeat/docs/configuration.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Here is a sample configuration:
[source,yaml]
--------------------------------------------------------------------------------
winlogbeat:
registry_file: C:/ProgramData/winlogbeat/.winlogbeat.yaml
registry_file: C:/ProgramData/winlogbeat/.winlogbeat.yml
event_logs:
- name: Application
ignore_older: 72h
Expand All @@ -38,15 +38,15 @@ winlogbeat:
===== registry_file

The name of the file where Winlogbeat stores information that it uses to resume
monitoring after a restart. By default the file is stored as `.winlogbeat.yaml`
monitoring after a restart. By default the file is stored as `.winlogbeat.yml`
in the directory where the Beat was started. When you run the process as a
Windows service, it's recommended that you set the value to
`C:/ProgramData/winlogbeat/.winlogbeat.yaml`.
`C:/ProgramData/winlogbeat/.winlogbeat.yml`.

[source,yaml]
--------------------------------------------------------------------------------
winlogbeat:
registry_file: C:/ProgramData/winlogbeat/.winlogbeat.yaml
registry_file: C:/ProgramData/winlogbeat/.winlogbeat.yml
--------------------------------------------------------------------------------

NOTE: The forward slashes (/) in the path are automatically changed to backslashes
Expand Down Expand Up @@ -121,4 +121,4 @@ include::../../libbeat/docs/shipperconfig.asciidoc[]

include::../../libbeat/docs/loggingconfig.asciidoc[]

include::../../libbeat/docs/runconfig.asciidoc[]
include::../../libbeat/docs/runconfig.asciidoc[]
2 changes: 1 addition & 1 deletion winlogbeat/docs/getting-started.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ the _winlogbeat.yml_ file:
[source,yaml]
--------------------------------------------------------------------------------
winlogbeat:
registry_file: C:/ProgramData/winlogbeat/.winlogbeat.yaml
registry_file: C:/ProgramData/winlogbeat/.winlogbeat.yml
event_logs:
- name: Application
Expand Down
4 changes: 2 additions & 2 deletions winlogbeat/etc/beat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
############################# Winlogbeat ######################################
winlogbeat:
# The registry file is where Winlogbeat persists its state so that the beat
# can resume after shutdown or an outage. The default is .winlogbeat.yaml
# can resume after shutdown or an outage. The default is .winlogbeat.yml
# in the directory in which it was started.
#registry_file: .winlogbeat.yaml
#registry_file: .winlogbeat.yml

# List of event logs to monitor.
#
Expand Down
4 changes: 2 additions & 2 deletions winlogbeat/etc/winlogbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
############################# Winlogbeat ######################################
winlogbeat:
# The registry file is where Winlogbeat persists its state so that the beat
# can resume after shutdown or an outage. The default is .winlogbeat.yaml
# can resume after shutdown or an outage. The default is .winlogbeat.yml
# in the directory in which it was started.
#registry_file: .winlogbeat.yaml
#registry_file: .winlogbeat.yml

# List of event logs to monitor.
#
Expand Down

0 comments on commit 43233eb

Please sign in to comment.