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

Update urso/ucfg to elastic/go-ucfg v0.3.0 #1900

Merged
merged 1 commit into from
Jun 23, 2016
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
4 changes: 4 additions & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ https://github.com/elastic/beats/compare/v5.0.0-alpha3...master[Check the HEAD d
- Reset backoff factor on partial ACK. {issue}1803[1803]
- Fix beats load balancer deadlock if max_retries: -1 or publish_async is enabled in filebeat. {issue}1829[1829]
- Fix logstash output with pipelining mode enabled not reconnecting. {issue}1876[1876]
- Empty configuration sections become merge-able with variables containing full path. {pull}1900[1900]
- Fix error message about required fields missing not printing the missing field name. {pull}1900[1900]

*Metricbeat*
- Fix the CPU values returned for each core. {issue}1863[1863]
Expand All @@ -51,6 +53,8 @@ https://github.com/elastic/beats/compare/v5.0.0-alpha3...master[Check the HEAD d


*Affecting all Beats*
- Improve error message if compiling regular expression from config files fails. {pull}1900[1900]


*Metricbeat*

Expand Down
4 changes: 2 additions & 2 deletions glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ import:
- breaker
- package: github.com/dustin/go-humanize
version: 499693e27ee0d14ffab67c31ad065fdb3d34ea75
- package: github.com/urso/ucfg
version: v0.2.1
- package: github.com/elastic/go-ucfg
version: v0.3.0
- package: github.com/armon/go-socks5
version: 3a873e99f5400ad7706e464e905ffcc94b3ff247
- package: github.com/pkg/errors
Expand Down
4 changes: 2 additions & 2 deletions libbeat/common/config.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package common

import (
"github.com/urso/ucfg"
"github.com/urso/ucfg/yaml"
"github.com/elastic/go-ucfg"
"github.com/elastic/go-ucfg/yaml"
)

type Config ucfg.Config
Expand Down
8 changes: 4 additions & 4 deletions metricbeat/mb/mb_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ func TestModuleConfig(t *testing.T) {
}{
{
in: map[string]interface{}{},
err: "missing required field accessing config",
err: "missing required field accessing 'module'",
},
{
in: map[string]interface{}{
"module": "example",
},
err: "missing required field accessing config",
err: "missing required field accessing 'metricsets'",
},
{
in: map[string]interface{}{
Expand Down Expand Up @@ -171,8 +171,8 @@ func TestNewBaseModuleFromModuleConfigStruct(t *testing.T) {
assert.Equal(t, moduleName, baseModule.Name())
assert.Equal(t, moduleName, baseModule.Config().Module)
assert.Equal(t, true, baseModule.Config().Enabled)
//assert.Equal(t, time.Second, baseModule.Config().Period) // TODO (urso/ucfg#25)
//assert.Equal(t, time.Second, baseModule.Config().Timeout) // TODO (urso/ucfg#25)
assert.Equal(t, time.Second, baseModule.Config().Period)
assert.Equal(t, time.Second, baseModule.Config().Timeout)
assert.Empty(t, baseModule.Config().Hosts)
}

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions vendor/github.com/elastic/go-ucfg/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

53 changes: 53 additions & 0 deletions vendor/github.com/elastic/go-ucfg/cfgutil/cfgutil.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions vendor/github.com/elastic/go-ucfg/flag/file.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading