Skip to content

Support tcp protocol #12

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.

Sign up for GitHub

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

Open
tukeJonny wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Support tcp protocol #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4168c95
Add protocol option
tukeJonny Feb 6, 2019
5adb7f8
Add some docs about protocol option
tukeJonny Feb 6, 2019
25a5da3
Add test for protocol option
tukeJonny Feb 6, 2019
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
8 changes: 8 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ message: `metrics { "f1":"100", "f2":"200", "f3":"300" }`
type graphite
host localhost
port 2003
protocol udp
tag_for prefix
name_keys f1,f3
</match>
Expand All @@ -52,6 +53,7 @@ message: `metrics { "f1":"100", "f2":"200", "f3":"300" }`
type graphite
host localhost
port 2003
protocol udp
tag_for prefix
name_key_pattern f\d
</match>
Expand All @@ -74,6 +76,7 @@ message: `metrics { "f1":"100", "f2":"200", "f3":"300" }`
type graphite
host localhost
port 2003
protocol udp
tag_for suffix
name_keys f1,f2
</match>
Expand All @@ -95,6 +98,7 @@ message: `metrics { "f1":"100", "f2":"200", "f3":"300" }`
type graphite
host localhost
port 2003
protocol udp
tag_for ignore
name_keys f1,f2
</match>
Expand All @@ -117,6 +121,10 @@ message: `metrics { "f1":"100", "f2":"200", "f3":"300" }`
- Default is `2003`.
- listening port of carbon-cache.

###### protocol
- Default is `udp`
- socket protocol such as `tcp`, `udp`.

###### tag_for
- Default is `prefix`.
- Either of `prefix`, `suffix` or `ignore`.
Expand Down
3 changes: 2 additions & 1 deletion lib/fluent/plugin/out_graphite.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ class Fluent::GraphiteOutput < Fluent::Output

config_param :host, :string
config_param :port, :integer, default: 2003
config_param :protocol, :string, default: 'udp'
config_param :tag_for, :string, default: 'prefix'
config_param :name_keys, :string, default: nil
config_param :name_key_pattern, :string, default: nil
Expand Down Expand Up @@ -110,6 +111,6 @@ def post(metrics, time)
end

def connect_client!
@client = GraphiteAPI.new(graphite: "#{@host}:#{@port}")
@client = GraphiteAPI.new(graphite: "#{@protocol}://#{@host}:#{@port}")
end
end
11 changes: 11 additions & 0 deletions test/plugin/test_out_graphite.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,44 @@

class GraphiteOutputTest < Test::Unit::TestCase
TCP_PORT = 42003
PROTOCOL = "tcp"
CONFIG_NAME_KEY_PATTERN = %[
host localhost
port #{TCP_PORT}
protocol #{PROTOCOL}
name_key_pattern ^((?!hostname).)*$
]
CONFIG_NAME_KEYS = %[
host localhost
port #{TCP_PORT}
protocol #{PROTOCOL}
name_keys dstat.total cpu usage.usr,dstat.total cpu usage.sys,dstat.total cpu usage.idl
]
CONFIG_TAG_FOR_IGNORE = %[
host localhost
port #{TCP_PORT}
protocol #{PROTOCOL}
name_keys dstat.total cpu usage.usr,dstat.total cpu usage.sys,dstat.total cpu usage.idl
tag_for ignore
]
CONFIG_TAG_FOR_SUFFIX = %[
host localhost
port #{TCP_PORT}
protocol #{PROTOCOL}
name_keys dstat.total cpu usage.usr,dstat.total cpu usage.sys,dstat.total cpu usage.idl
tag_for suffix
]
CONFIG_INVALID_TAG_FOR = %[
host localhost
port #{TCP_PORT}
protocol #{PROTOCOL}
name_key_pattern ^((?!hostname).)*$
tag_for invalid
]
CONFIG_SPECIFY_BOTH_NAME_KEYS_AND_NAME_KEY_PATTERN = %[
host localhost
port #{TCP_PORT}
protocol #{PROTOCOL}
name_keys dstat.total cpu usage.usr,dstat.total cpu usage.sys,dstat.total cpu usage.idl
name_key_pattern ^((?!hostname).)*$
]
Expand All @@ -54,27 +61,31 @@ def test_configure
d = create_driver
assert_equal d.instance.host, 'localhost'
assert_equal d.instance.port, TCP_PORT
assert_equal d.instance.protocol, PROTOCOL
assert_equal d.instance.tag_for, 'prefix'
assert_equal d.instance.name_keys, nil
assert_equal d.instance.name_key_pattern, /^((?!hostname).)*$/

d = create_driver(CONFIG_NAME_KEYS)
assert_equal d.instance.host, 'localhost'
assert_equal d.instance.port, TCP_PORT
assert_equal d.instance.protocol, PROTOCOL
assert_equal d.instance.tag_for, 'prefix'
assert_equal d.instance.name_keys, ['dstat.total cpu usage.usr', 'dstat.total cpu usage.sys', 'dstat.total cpu usage.idl']
assert_equal d.instance.name_key_pattern, nil

d = create_driver(CONFIG_TAG_FOR_IGNORE)
assert_equal d.instance.host, 'localhost'
assert_equal d.instance.port, TCP_PORT
assert_equal d.instance.protocol, PROTOCOL
assert_equal d.instance.tag_for, 'ignore'
assert_equal d.instance.name_keys, ['dstat.total cpu usage.usr', 'dstat.total cpu usage.sys', 'dstat.total cpu usage.idl']
assert_equal d.instance.name_key_pattern, nil

d = create_driver(CONFIG_TAG_FOR_SUFFIX)
assert_equal d.instance.host, 'localhost'
assert_equal d.instance.port, TCP_PORT
assert_equal d.instance.protocol, PROTOCOL
assert_equal d.instance.tag_for, 'suffix'
assert_equal d.instance.name_keys, ['dstat.total cpu usage.usr', 'dstat.total cpu usage.sys', 'dstat.total cpu usage.idl']
assert_equal d.instance.name_key_pattern, nil
Expand Down